The Linux Kernel Mailing List
 help / color / mirror / Atom feed
From: Philipp Zabel <philipp.zabel@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: Anton Vorontsov <cbou@mail.ru>
Subject: [PATCH] pda_power: add init and exit function callbacks
Date: Sat, 12 Apr 2008 13:47:45 +0200	[thread overview]
Message-ID: <1208000865.9566.6.camel@localhost.localdomain> (raw)

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>
---
 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



             reply	other threads:[~2008-04-12 11:47 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-04-12 11:47 Philipp Zabel [this message]
2008-04-15  8:44 ` [PATCH] pda_power: add init and exit function callbacks Anton Vorontsov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1208000865.9566.6.camel@localhost.localdomain \
    --to=philipp.zabel@gmail.com \
    --cc=cbou@mail.ru \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox