2011-03-14 20:12:42

by Heiko Stuebner

Subject: [PATCH] s3c_adc_battery: Fix method names when PM not set

From: Heiko Stuebner <[email protected]>

s3c_adc_battery declares wrong method names when CONFIG_PM is not set.

Signed-off-by: Heiko Stuebner <[email protected]>

---
drivers/power/s3c_adc_battery.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/power/s3c_adc_battery.c b/drivers/power/s3c_adc_battery.c
index 4255f23..d36c289 100644
--- a/drivers/power/s3c_adc_battery.c
+++ b/drivers/power/s3c_adc_battery.c
@@ -406,8 +406,8 @@ static int s3c_adc_bat_resume(struct platform_device *pdev)
return 0;
}
#else
-#define s3c_adc_battery_suspend NULL
-#define s3c_adc_battery_resume NULL
+#define s3c_adc_bat_suspend NULL
+#define s3c_adc_bat_resume NULL
#endif

static struct platform_driver s3c_adc_bat_driver = {
--
tg: (2fbfac4..) topic/fixes/s3c_adc_battery_nopm (depends on: master)

2011-03-14 21:39:15

by Vasily Khoruzhick

Subject: Re: [PATCH] s3c_adc_battery: Fix method names when PM not set

On Monday 14 March 2011 22:12:39 Heiko St?bner wrote:
> From: Heiko Stuebner <[email protected]>
>
> s3c_adc_battery declares wrong method names when CONFIG_PM is not set.
>
> Signed-off-by: Heiko Stuebner <[email protected]>

Acked-by: Vasily Khoruzhick <[email protected]>

> ---
> drivers/power/s3c_adc_battery.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/power/s3c_adc_battery.c
> b/drivers/power/s3c_adc_battery.c index 4255f23..d36c289 100644
> --- a/drivers/power/s3c_adc_battery.c
> +++ b/drivers/power/s3c_adc_battery.c
> @@ -406,8 +406,8 @@ static int s3c_adc_bat_resume(struct platform_device
> *pdev) return 0;
> }
> #else
> -#define s3c_adc_battery_suspend NULL
> -#define s3c_adc_battery_resume NULL
> +#define s3c_adc_bat_suspend NULL
> +#define s3c_adc_bat_resume NULL
> #endif
>
> static struct platform_driver s3c_adc_bat_driver = {

2011-03-16 13:42:17

by Anton Vorontsov

Subject: Re: [PATCH] s3c_adc_battery: Fix method names when PM not set

On Mon, Mar 14, 2011 at 11:38:40PM +0200, Vasily Khoruzhick wrote:
> On Monday 14 March 2011 22:12:39 Heiko Stübner wrote:
> > From: Heiko Stuebner <[email protected]>
> >
> > s3c_adc_battery declares wrong method names when CONFIG_PM is not set.
> >
> > Signed-off-by: Heiko Stuebner <[email protected]>
>
> Acked-by: Vasily Khoruzhick <[email protected]>

Applied, thanks!

--
Anton Vorontsov
Email: [email protected]