2010-01-27 20:45:41

by Mark Brown

Subject: [PATCH] power_supply: Clean up wm97xx_battery warnings

Staticise work_lock (nothing outside the driver has any reason to
see it) and specify dev when requesting the charger IRQ (since that's
what we pass in when we free it).

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

diff --git a/drivers/power/wm97xx_battery.c b/drivers/power/wm97xx_battery.c
index 6ea3cb5..23eed35 100644
--- a/drivers/power/wm97xx_battery.c
+++ b/drivers/power/wm97xx_battery.c
@@ -26,7 +26,7 @@

static DEFINE_MUTEX(bat_lock);
static struct work_struct bat_work;
-struct mutex work_lock;
+static struct mutex work_lock;
static int bat_status = POWER_SUPPLY_STATUS_UNKNOWN;
static struct wm97xx_batt_info *gpdata;
static enum power_supply_property *prop;
@@ -203,7 +203,7 @@ static int __devinit wm97xx_bat_probe(struct platform_device *dev)
goto err2;
ret = request_irq(gpio_to_irq(pdata->charge_gpio),
wm97xx_chrg_irq, IRQF_DISABLED,
- "AC Detect", 0);
+ "AC Detect", dev);
if (ret)
goto err2;
props++; /* POWER_SUPPLY_PROP_STATUS */
--
1.6.6

2010-01-29 10:11:27

by Marek Vasut

Subject: Re: [PATCH] power_supply: Clean up wm97xx_battery warnings

Dne St 27. ledna 2010 21:45:35 Mark Brown napsal(a):
> Staticise work_lock (nothing outside the driver has any reason to
> see it) and specify dev when requesting the charger IRQ (since that's
> what we pass in when we free it).
>
> Signed-off-by: Mark Brown <[email protected]>

Hi, thanks.

Acked-by: Marek Vasut <[email protected]>

> ---
> drivers/power/wm97xx_battery.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/power/wm97xx_battery.c
> b/drivers/power/wm97xx_battery.c index 6ea3cb5..23eed35 100644
> --- a/drivers/power/wm97xx_battery.c
> +++ b/drivers/power/wm97xx_battery.c
> @@ -26,7 +26,7 @@
>
> static DEFINE_MUTEX(bat_lock);
> static struct work_struct bat_work;
> -struct mutex work_lock;
> +static struct mutex work_lock;
> static int bat_status = POWER_SUPPLY_STATUS_UNKNOWN;
> static struct wm97xx_batt_info *gpdata;
> static enum power_supply_property *prop;
> @@ -203,7 +203,7 @@ static int __devinit wm97xx_bat_probe(struct
> platform_device *dev) goto err2;
> ret = request_irq(gpio_to_irq(pdata->charge_gpio),
> wm97xx_chrg_irq, IRQF_DISABLED,
> - "AC Detect", 0);
> + "AC Detect", dev);
> if (ret)
> goto err2;
> props++; /* POWER_SUPPLY_PROP_STATUS */
>

2010-01-29 14:04:15

by Anton Vorontsov

Subject: Re: [PATCH] power_supply: Clean up wm97xx_battery warnings

On Fri, Jan 29, 2010 at 11:11:11AM +0100, Marek Vasut wrote:
> Dne St 27. ledna 2010 21:45:35 Mark Brown napsal(a):
> > Staticise work_lock (nothing outside the driver has any reason to
> > see it) and specify dev when requesting the charger IRQ (since that's
> > what we pass in when we free it).
> >
> > Signed-off-by: Mark Brown <[email protected]>
>
> Hi, thanks.
>
> Acked-by: Marek Vasut <[email protected]>

Applied to battery-2.6 (for 2.6.34). Thanks!