2011-05-24 10:46:13

by Mark Brown

Subject: [PATCH] power_supply: Fix annotation for s3c_adc_battery_probe()

A probe() function is used at device init time rather than system init time.

Signed-off-by: Mark Brown <[email protected]>
---
drivers/power/s3c_adc_battery.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/power/s3c_adc_battery.c b/drivers/power/s3c_adc_battery.c
index d36c289..a675e31 100644
--- a/drivers/power/s3c_adc_battery.c
+++ b/drivers/power/s3c_adc_battery.c
@@ -266,7 +266,7 @@ static irqreturn_t s3c_adc_bat_charged(int irq, void *dev_id)
return IRQ_HANDLED;
}

-static int __init s3c_adc_bat_probe(struct platform_device *pdev)
+static int __devinit s3c_adc_bat_probe(struct platform_device *pdev)
{
struct s3c_adc_client *client;
struct s3c_adc_bat_pdata *pdata = pdev->dev.platform_data;
--
1.7.5.1

2011-05-24 11:36:19

by Vasily Khoruzhick

Subject: Re: [PATCH] power_supply: Fix annotation for s3c_adc_battery_probe()

On Tuesday 24 May 2011 13:46:02 Mark Brown wrote:
> A probe() function is used at device init time rather than system init
> time.
>
> Signed-off-by: Mark Brown <[email protected]>

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

> ---
> drivers/power/s3c_adc_battery.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/power/s3c_adc_battery.c
> b/drivers/power/s3c_adc_battery.c index d36c289..a675e31 100644
> --- a/drivers/power/s3c_adc_battery.c
> +++ b/drivers/power/s3c_adc_battery.c
> @@ -266,7 +266,7 @@ static irqreturn_t s3c_adc_bat_charged(int irq, void
> *dev_id) return IRQ_HANDLED;
> }
>
> -static int __init s3c_adc_bat_probe(struct platform_device *pdev)
> +static int __devinit s3c_adc_bat_probe(struct platform_device *pdev)
> {
> struct s3c_adc_client *client;
> struct s3c_adc_bat_pdata *pdata = pdev->dev.platform_data;

2011-05-24 19:19:45

by Anton Vorontsov

Subject: Re: [PATCH] power_supply: Fix annotation for s3c_adc_battery_probe()

On Tue, May 24, 2011 at 02:36:00PM +0300, Vasily Khoruzhick wrote:
> On Tuesday 24 May 2011 13:46:02 Mark Brown wrote:
> > A probe() function is used at device init time rather than system init
> > time.
> >
> > Signed-off-by: Mark Brown <[email protected]>
>
> Acked-by: Vasily Khoruzhick <[email protected]>

Applied, thank you!

> > ---
> > drivers/power/s3c_adc_battery.c | 2 +-
> > 1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/drivers/power/s3c_adc_battery.c
> > b/drivers/power/s3c_adc_battery.c index d36c289..a675e31 100644
> > --- a/drivers/power/s3c_adc_battery.c
> > +++ b/drivers/power/s3c_adc_battery.c
> > @@ -266,7 +266,7 @@ static irqreturn_t s3c_adc_bat_charged(int irq, void
> > *dev_id) return IRQ_HANDLED;
> > }
> >
> > -static int __init s3c_adc_bat_probe(struct platform_device *pdev)
> > +static int __devinit s3c_adc_bat_probe(struct platform_device *pdev)
> > {
> > struct s3c_adc_client *client;
> > struct s3c_adc_bat_pdata *pdata = pdev->dev.platform_data;

--
Anton Vorontsov
Email: [email protected]