diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-27 15:45:35 -0500 |
|---|---|---|
| committer | Anton Vorontsov <avorontsov@ru.mvista.com> | 2010-01-29 09:02:13 -0500 |
| commit | f8d94eb77e4ef6d80c6b7e5e02b92180d9a6f37b (patch) | |
| tree | 9dadb7a165970a7d896076bea24d973ccb6d3314 | |
| parent | 12b336a8b4ea8652372f88521bf55cef7f5d5283 (diff) | |
wm97xx_battery: Clean up some 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 <broonie@opensource.wolfsonmicro.com>
Acked-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
| -rw-r--r-- | 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 6ea3cb5837c7..23eed356a854 100644 --- a/drivers/power/wm97xx_battery.c +++ b/drivers/power/wm97xx_battery.c | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | 26 | ||
| 27 | static DEFINE_MUTEX(bat_lock); | 27 | static DEFINE_MUTEX(bat_lock); |
| 28 | static struct work_struct bat_work; | 28 | static struct work_struct bat_work; |
| 29 | struct mutex work_lock; | 29 | static struct mutex work_lock; |
| 30 | static int bat_status = POWER_SUPPLY_STATUS_UNKNOWN; | 30 | static int bat_status = POWER_SUPPLY_STATUS_UNKNOWN; |
| 31 | static struct wm97xx_batt_info *gpdata; | 31 | static struct wm97xx_batt_info *gpdata; |
| 32 | static enum power_supply_property *prop; | 32 | static enum power_supply_property *prop; |
| @@ -203,7 +203,7 @@ static int __devinit wm97xx_bat_probe(struct platform_device *dev) | |||
| 203 | goto err2; | 203 | goto err2; |
| 204 | ret = request_irq(gpio_to_irq(pdata->charge_gpio), | 204 | ret = request_irq(gpio_to_irq(pdata->charge_gpio), |
| 205 | wm97xx_chrg_irq, IRQF_DISABLED, | 205 | wm97xx_chrg_irq, IRQF_DISABLED, |
| 206 | "AC Detect", 0); | 206 | "AC Detect", dev); |
| 207 | if (ret) | 207 | if (ret) |
| 208 | goto err2; | 208 | goto err2; |
| 209 | props++; /* POWER_SUPPLY_PROP_STATUS */ | 209 | props++; /* POWER_SUPPLY_PROP_STATUS */ |
