[PATCH] pda_power: add function callbacks for suspend and resume

[PATCH] pda_power: add function callbacks for suspend and resume

[Daniel Mack]

Add function prototypes for power management events so they can be
handled and used by platform implementations.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Cc: Dmitry Baryshkov <dbaryshkov@gmail.com>
Cc: Anton Vorontsov <cbou@mail.ru>
Cc: David Woodhouse <dwmw2@infradead.org>
---
 drivers/power/pda_power.c |    9 +++++++++
 include/linux/pda_power.h |    2 ++
 2 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
index a232de6..0b27b9d 100644
--- a/drivers/power/pda_power.c
+++ b/drivers/power/pda_power.c
@@ -404,6 +404,12 @@ static int usb_wakeup_enabled;
 
 static int pda_power_suspend(struct platform_device *pdev, pm_message_t state)
 {
+	if (pdata->suspend) {
+		int ret = pdata->suspend(state);
+		if (ret)
+			return ret;
+	}
+
 	if (device_may_wakeup(&pdev->dev)) {
 		if (ac_irq)
 			ac_wakeup_enabled = !enable_irq_wake(ac_irq->start);
@@ -423,6 +429,9 @@ static int pda_power_resume(struct platform_device *pdev)
 			disable_irq_wake(ac_irq->start);
 	}
 
+	if (pdata->resume)
+		return pdata->resume();
+
 	return 0;
 }
 #else
diff --git a/include/linux/pda_power.h b/include/linux/pda_power.h
index d4cf7a2..c9e4d81 100644
--- a/include/linux/pda_power.h
+++ b/include/linux/pda_power.h
@@ -24,6 +24,8 @@ struct pda_power_pdata {
 	int (*is_usb_online)(void);
 	void (*set_charge)(int flags);
 	void (*exit)(struct device *dev);
+	int (*suspend)(pm_message_t state);
+	int (*resume)(void);
 
 	char **supplied_to;
 	size_t num_supplicants;
-- 
1.7.0.3

Re: [PATCH] pda_power: add function callbacks for suspend and resume

[Daniel Mack]

Ping.

On Mon, Apr 12, 2010 at 11:33:22PM +0200, Daniel Mack wrote:
> Add function prototypes for power management events so they can be
> handled and used by platform implementations.
> 
> Signed-off-by: Daniel Mack <daniel@caiaq.de>
> Cc: Dmitry Baryshkov <dbaryshkov@gmail.com>
> Cc: Anton Vorontsov <cbou@mail.ru>
> Cc: David Woodhouse <dwmw2@infradead.org>
> ---
>  drivers/power/pda_power.c |    9 +++++++++
>  include/linux/pda_power.h |    2 ++
>  2 files changed, 11 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
> index a232de6..0b27b9d 100644
> --- a/drivers/power/pda_power.c
> +++ b/drivers/power/pda_power.c
> @@ -404,6 +404,12 @@ static int usb_wakeup_enabled;
>  
>  static int pda_power_suspend(struct platform_device *pdev, pm_message_t state)
>  {
> +	if (pdata->suspend) {
> +		int ret = pdata->suspend(state);
> +		if (ret)
> +			return ret;
> +	}
> +
>  	if (device_may_wakeup(&pdev->dev)) {
>  		if (ac_irq)
>  			ac_wakeup_enabled = !enable_irq_wake(ac_irq->start);
> @@ -423,6 +429,9 @@ static int pda_power_resume(struct platform_device *pdev)
>  			disable_irq_wake(ac_irq->start);
>  	}
>  
> +	if (pdata->resume)
> +		return pdata->resume();
> +
>  	return 0;
>  }
>  #else
> diff --git a/include/linux/pda_power.h b/include/linux/pda_power.h
> index d4cf7a2..c9e4d81 100644
> --- a/include/linux/pda_power.h
> +++ b/include/linux/pda_power.h
> @@ -24,6 +24,8 @@ struct pda_power_pdata {
>  	int (*is_usb_online)(void);
>  	void (*set_charge)(int flags);
>  	void (*exit)(struct device *dev);
> +	int (*suspend)(pm_message_t state);
> +	int (*resume)(void);
>  
>  	char **supplied_to;
>  	size_t num_supplicants;
> -- 
> 1.7.0.3
> 

Re: [PATCH] pda_power: add function callbacks for suspend and resume

[Anton Vorontsov]

On Mon, Apr 12, 2010 at 11:33:22PM +0200, Daniel Mack wrote:
> Add function prototypes for power management events so they can be
> handled and used by platform implementations.
> 
> Signed-off-by: Daniel Mack <daniel@caiaq.de>
> Cc: Dmitry Baryshkov <dbaryshkov@gmail.com>
> Cc: Anton Vorontsov <cbou@mail.ru>
> Cc: David Woodhouse <dwmw2@infradead.org>
> ---

Applied, thanks!

-- 
Anton Vorontsov
email: cbouatmailru@gmail.com
irc://irc.freenode.net/bd2