[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1208000865.9566.6.camel@localhost.localdomain>
Date: Sat, 12 Apr 2008 13:47:45 +0200
From: Philipp Zabel <philipp.zabel@...il.com>
To: linux-kernel@...r.kernel.org
Cc: Anton Vorontsov <cbou@...l.ru>
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 <philipp.zabel@...il.com>
---
drivers/power/pda_power.c | 11 +++++++++++
include/linux/pda_power.h | 2 ++
2 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
index c8aa55b..5a0c434 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();
@@ -299,6 +305,9 @@ ac_irq_failed:
power_supply_unregister(&pda_psy_ac);
ac_supply_failed:
wrongid:
+ if (pdata->exit)
+ pdata->exit(dev);
+init_failed:
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 225beb1..8ad67bb 100644
--- a/include/linux/pda_power.h
+++ b/include/linux/pda_power.h
@@ -17,9 +17,11 @@
#define PDA_POWER_CHARGE_USB (1 << 1)
struct pda_power_pdata {
+ int (*init)(struct device *);
int (*is_ac_online)(void);
int (*is_usb_online)(void);
void (*set_charge)(int flags);
+ void (*exit)(struct device *);
char **supplied_to;
size_t num_supplicants;
--
1.5.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists