diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-03 10:57:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-03 10:57:57 -0700 |
| commit | 38e80121bd7d0c493072442ac7eddcba165a07a8 (patch) | |
| tree | 66c948222e45b461f9d1b8917b222a0c90af9e6e | |
| parent | e098675635479e9267cf2b12fb969c463cf506ab (diff) | |
| parent | 35bf559145b6332f5465c15a4e5cd7a363985382 (diff) | |
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
| -rw-r--r-- | drivers/power/pda_power.c | 11 | ||||
| -rw-r--r-- | drivers/power/pmu_battery.c | 2 | ||||
| -rw-r--r-- | include/linux/pda_power.h | 4 |
3 files changed, 16 insertions, 1 deletions
diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c index c8aa55b81fd8..82810b7bff9c 100644 --- 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 60a8cf3a0431..9346a862f1f2 100644 --- 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 225beb136807..cb7d10f30763 100644 --- 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; |