* [PATCH] power supply: collie_battery: convert to use dev_pm_ops
@ 2013-07-20 23:07 Andrea Adami
2013-08-09 20:43 ` Anton Vorontsov
0 siblings, 1 reply; 2+ messages in thread
From: Andrea Adami @ 2013-07-20 23:07 UTC (permalink / raw)
To: linux-kernel; +Cc: David Woodhouse, Anton Vorontsov, Russell King
Fix
linux/drivers/power/collie_battery.c:372:2: warning: initialization from
incompatible pointer type [enabled by default]
linux/drivers/power/collie_battery.c:372:2: warning: (near initialization
for 'collie_bat_driver.suspend') [enabled by default]
Referencess:
MFD: ucb1x00-core: convert to use dev_pm_ops
https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/include/linux/mfd?id=5a09b7120a965a7d7e8494d0ed509135bbce0118
MFD: mcp-core: remove legacy driver suspend/resume methods
https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/include/linux/mfd?id=cf4abfcc0df2985ff6061f74e63b8353f2a1d0bc
Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
---
drivers/power/collie_battery.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/power/collie_battery.c b/drivers/power/collie_battery.c
index c58d0e3..d02ae02 100644
--- a/drivers/power/collie_battery.c
+++ b/drivers/power/collie_battery.c
@@ -287,7 +287,7 @@ static struct gpio collie_batt_gpios[] = {
};
#ifdef CONFIG_PM
-static int collie_bat_suspend(struct ucb1x00_dev *dev, pm_message_t state)
+static int collie_bat_suspend(struct ucb1x00_dev *dev)
{
/* flush all pending status updates */
flush_work(&bat_work);
--
1.8.1.5
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] power supply: collie_battery: convert to use dev_pm_ops
2013-07-20 23:07 [PATCH] power supply: collie_battery: convert to use dev_pm_ops Andrea Adami
@ 2013-08-09 20:43 ` Anton Vorontsov
0 siblings, 0 replies; 2+ messages in thread
From: Anton Vorontsov @ 2013-08-09 20:43 UTC (permalink / raw)
To: Andrea Adami; +Cc: linux-kernel, David Woodhouse, Russell King
On Sun, Jul 21, 2013 at 01:07:44AM +0200, Andrea Adami wrote:
> Fix
> linux/drivers/power/collie_battery.c:372:2: warning: initialization from
> incompatible pointer type [enabled by default]
> linux/drivers/power/collie_battery.c:372:2: warning: (near initialization
> for 'collie_bat_driver.suspend') [enabled by default]
>
> Referencess:
> MFD: ucb1x00-core: convert to use dev_pm_ops
> https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/include/linux/mfd?id=5a09b7120a965a7d7e8494d0ed509135bbce0118
>
> MFD: mcp-core: remove legacy driver suspend/resume methods
> https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/include/linux/mfd?id=cf4abfcc0df2985ff6061f74e63b8353f2a1d0bc
>
> Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
> ---
Applied. Thanks a lot, Andrea!
> drivers/power/collie_battery.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/power/collie_battery.c b/drivers/power/collie_battery.c
> index c58d0e3..d02ae02 100644
> --- a/drivers/power/collie_battery.c
> +++ b/drivers/power/collie_battery.c
> @@ -287,7 +287,7 @@ static struct gpio collie_batt_gpios[] = {
> };
>
> #ifdef CONFIG_PM
> -static int collie_bat_suspend(struct ucb1x00_dev *dev, pm_message_t state)
> +static int collie_bat_suspend(struct ucb1x00_dev *dev)
> {
> /* flush all pending status updates */
> flush_work(&bat_work);
> --
> 1.8.1.5
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-08-09 20:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-07-20 23:07 [PATCH] power supply: collie_battery: convert to use dev_pm_ops Andrea Adami
2013-08-09 20:43 ` Anton Vorontsov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®