linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] power_supply: wm97xx_battery: Use DEFINE_MUTEX() for work_lock
@ 2011-11-28 14:37 Axel Lin
  2012-01-06  1:09 ` Anton Vorontsov
  0 siblings, 1 reply; 2+ messages in thread
From: Axel Lin @ 2011-11-28 14:37 UTC (permalink / raw)
  To: linux-kernel; +Cc: Anton Vorontsov, Marek Vasut

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>
---
 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 cf8681c..eaa454b 100644
--- a/drivers/power/wm97xx_battery.c
+++ b/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;
-- 
1.7.5.4




^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] power_supply: wm97xx_battery: Use DEFINE_MUTEX() for work_lock
  2011-11-28 14:37 [PATCH] power_supply: wm97xx_battery: Use DEFINE_MUTEX() for work_lock Axel Lin
@ 2012-01-06  1:09 ` Anton Vorontsov
  0 siblings, 0 replies; 2+ messages in thread
From: Anton Vorontsov @ 2012-01-06  1:09 UTC (permalink / raw)
  To: Axel Lin; +Cc: linux-kernel, Marek Vasut

On Mon, Nov 28, 2011 at 10:37:35PM +0800, Axel Lin wrote:
> 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>

Applied, thanks!

> ---
>  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 cf8681c..eaa454b 100644
> --- a/drivers/power/wm97xx_battery.c
> +++ b/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;
> -- 
> 1.7.5.4

-- 
Anton Vorontsov
Email: cbouatmailru@gmail.com

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-01-06  1:09 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-11-28 14:37 [PATCH] power_supply: wm97xx_battery: Use DEFINE_MUTEX() for work_lock Axel Lin
2012-01-06  1:09 ` Anton Vorontsov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).