diff options
author | Axel Lin <axel.lin@gmail.com> | 2011-11-28 09:37:35 -0500 |
---|---|---|
committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2012-01-05 20:00:30 -0500 |
commit | daf22c3c4444e10a852a2f460f5cb1a43038bd53 (patch) | |
tree | 6762def93163d68fcfa1d548d357f75936b45e9c /drivers/power | |
parent | 68597986f7db9abbe380af3db6a34b6c83cdf302 (diff) |
wm97xx_battery: Use DEFINE_MUTEX() for work_lock
work_lock can be initialized automatically with
DEFINE_MUTEX() rather than explicitly calling mutex_init().
This patch also removes an unused bat_lock mutex.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
Diffstat (limited to 'drivers/power')
-rw-r--r-- | drivers/power/wm97xx_battery.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/power/wm97xx_battery.c b/drivers/power/wm97xx_battery.c index 199818f9d181..d2d4c08c681c 100644 --- a/drivers/power/wm97xx_battery.c +++ b/drivers/power/wm97xx_battery.c | |||
@@ -25,9 +25,8 @@ | |||
25 | #include <linux/irq.h> | 25 | #include <linux/irq.h> |
26 | #include <linux/slab.h> | 26 | #include <linux/slab.h> |
27 | 27 | ||
28 | static DEFINE_MUTEX(bat_lock); | ||
29 | static struct work_struct bat_work; | 28 | static struct work_struct bat_work; |
30 | static struct mutex work_lock; | 29 | static DEFINE_MUTEX(work_lock); |
31 | static int bat_status = POWER_SUPPLY_STATUS_UNKNOWN; | 30 | static int bat_status = POWER_SUPPLY_STATUS_UNKNOWN; |
32 | static enum power_supply_property *prop; | 31 | static enum power_supply_property *prop; |
33 | 32 | ||
@@ -181,8 +180,6 @@ static int __devinit wm97xx_bat_probe(struct platform_device *dev) | |||
181 | if (dev->id != -1) | 180 | if (dev->id != -1) |
182 | return -EINVAL; | 181 | return -EINVAL; |
183 | 182 | ||
184 | mutex_init(&work_lock); | ||
185 | |||
186 | if (!pdata) { | 183 | if (!pdata) { |
187 | dev_err(&dev->dev, "No platform_data supplied\n"); | 184 | dev_err(&dev->dev, "No platform_data supplied\n"); |
188 | return -EINVAL; | 185 | return -EINVAL; |