From f6b6b180b4614e57af217045f71caedd94821fc7 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sat, 12 Apr 2008 13:47:45 +0200 Subject: [PATCH] pda_power: add init and exit function callbacks This adds init/exit function callbacks to pda_power, to provide a place where the platform code can request/free GPIOs that it wants to use in the is_ac_online, is_usb_online and set_charge functions. Signed-off-by: Philipp Zabel Signed-off-by: Anton Vorontsov --- drivers/power/pda_power.c | 11 +++++++++++ include/linux/pda_power.h | 4 ++++ 2 files changed, 15 insertions(+) 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/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; -- 2.34.1