From daf22c3c4444e10a852a2f460f5cb1a43038bd53 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Mon, 28 Nov 2011 22:37:35 +0800 Subject: 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 Signed-off-by: Anton Vorontsov --- drivers/power/wm97xx_battery.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'drivers/power/wm97xx_battery.c') diff --git a/drivers/power/wm97xx_battery.c b/drivers/power/wm97xx_battery.c index 199818f9d18..d2d4c08c681 100644 --- a/drivers/power/wm97xx_battery.c +++ b/drivers/power/wm97xx_battery.c @@ -25,9 +25,8 @@ #include #include -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; -- cgit v1.2.3