From 98686a63e821b2276d60a5e8bd16ab73b5bfc4ac Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Mon, 28 Nov 2011 22:37:35 +0800
Subject: [PATCH] --- yaml --- r: 283471 b: refs/heads/master c:
 daf22c3c4444e10a852a2f460f5cb1a43038bd53 h: refs/heads/master i:   283469:
 6f60deb7d2dc072876c3e495d6e859f758b3452e   283467:
 2ede0bc09635e7d2b5e9235a98e8dac577ed8a3a   283463:
 19389a6a79b1dd9fe6559eaf4bcca2d30cb14578   283455:
 7825c094532fe425e8bc01e436aa0f931db2356b v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/power/wm97xx_battery.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 633647a13562..6708a97dccff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68597986f7db9abbe380af3db6a34b6c83cdf302
+refs/heads/master: daf22c3c4444e10a852a2f460f5cb1a43038bd53
diff --git a/trunk/drivers/power/wm97xx_battery.c b/trunk/drivers/power/wm97xx_battery.c
index 199818f9d181..d2d4c08c681c 100644
--- a/trunk/drivers/power/wm97xx_battery.c
+++ b/trunk/drivers/power/wm97xx_battery.c
@@ -25,9 +25,8 @@
 #include <linux/irq.h>
 #include <linux/slab.h>
 
-static DEFINE_MUTEX(bat_lock);
 static struct work_struct bat_work;
-static struct mutex work_lock;
+static DEFINE_MUTEX(work_lock);
 static int bat_status = POWER_SUPPLY_STATUS_UNKNOWN;
 static enum power_supply_property *prop;
 
@@ -181,8 +180,6 @@ static int __devinit wm97xx_bat_probe(struct platform_device *dev)
 	if (dev->id != -1)
 		return -EINVAL;
 
-	mutex_init(&work_lock);
-
 	if (!pdata) {
 		dev_err(&dev->dev, "No platform_data supplied\n");
 		return -EINVAL;