Merge git://git.infradead.org/battery-2.6

* git://git.infradead.org/battery-2.6:
  PMU battery: filenames in sysfs with spaces
  pda_power: add init and exit function callbacks

diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
index c8aa55b..82810b7 100644 (file)
--- a/drivers/power/pda_power.c
+++ b/drivers/power/pda_power.c
@@ -209,6 +209,12 @@ static int pda_power_probe(struct platform_device *pdev)
 
        pdata = pdev->dev.platform_data;
 
+       if (pdata->init) {
+               ret = pdata->init(dev);
+               if (ret < 0)
+                       goto init_failed;
+       }
+
        update_status();
        update_charger();
 
@@ -298,6 +304,9 @@ ac_irq_failed:
        if (pdata->is_ac_online)
                power_supply_unregister(&pda_psy_ac);
 ac_supply_failed:
+       if (pdata->exit)
+               pdata->exit(dev);
+init_failed:
 wrongid:
        return ret;
 }
@@ -318,6 +327,8 @@ static int pda_power_remove(struct platform_device *pdev)
                power_supply_unregister(&pda_psy_usb);
        if (pdata->is_ac_online)
                power_supply_unregister(&pda_psy_ac);
+       if (pdata->exit)
+               pdata->exit(dev);
 
        return 0;
 }

diff --git a/drivers/power/pmu_battery.c b/drivers/power/pmu_battery.c
index 60a8cf3..9346a86 100644 (file)
--- a/drivers/power/pmu_battery.c
+++ b/drivers/power/pmu_battery.c
@@ -159,7 +159,7 @@ static int __init pmu_bat_init(void)
                if (!pbat)
                        break;
 
-               sprintf(pbat->name, "PMU battery %d", i);
+               sprintf(pbat->name, "PMU_battery_%d", i);
                pbat->bat.name = pbat->name;
                pbat->bat.properties = pmu_bat_props;
                pbat->bat.num_properties = ARRAY_SIZE(pmu_bat_props);

diff --git a/include/linux/pda_power.h b/include/linux/pda_power.h
index 225beb1..cb7d10f 100644 (file)
--- a/include/linux/pda_power.h
+++ b/include/linux/pda_power.h
@@ -16,10 +16,14 @@
 #define PDA_POWER_CHARGE_AC  (1 << 0)
 #define PDA_POWER_CHARGE_USB (1 << 1)
 
+struct device;
+
 struct pda_power_pdata {
+       int (*init)(struct device *dev);
        int (*is_ac_online)(void);
        int (*is_usb_online)(void);
        void (*set_charge)(int flags);
+       void (*exit)(struct device *dev);
 
        char **supplied_to;
        size_t num_supplicants;