Skip to content

Commit

Permalink
pda_power: add init and exit function callbacks
Browse files Browse the repository at this point in the history
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@gmail.com>
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
  • Loading branch information
Philipp Zabel authored and Anton Vorontsov committed May 2, 2008
1 parent a985aab commit f6b6b18
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 0 deletions.
11 changes: 11 additions & 0 deletions drivers/power/pda_power.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down Expand Up @@ -298,6 +304,9 @@ static int pda_power_probe(struct platform_device *pdev)
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;
}
Expand All @@ -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;
}
Expand Down
4 changes: 4 additions & 0 deletions include/linux/pda_power.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit f6b6b18

Please sign in to comment.