[patch 3/5] macintosh: therm_windtunnel: semaphore to mutex

[patch 3/5] macintosh: therm_windtunnel: semaphore to mutex

[akpm]

From: Daniel Walker <dwalker@mvista.com>

Signed-off-by: Daniel Walker <dwalker@mvista.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/macintosh/therm_windtunnel.c |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff -puN drivers/macintosh/therm_windtunnel.c~macintosh-therm_windtunnel-semaphore-to-mutex drivers/macintosh/therm_windtunnel.c
--- a/drivers/macintosh/therm_windtunnel.c~macintosh-therm_windtunnel-semaphore-to-mutex
+++ a/drivers/macintosh/therm_windtunnel.c
@@ -62,7 +62,7 @@ static struct {
 	volatile int		running;
 	struct task_struct	*poll_task;
 	
-	struct semaphore 	lock;
+	struct mutex	 	lock;
 	struct of_device	*of_dev;
 	
 	struct i2c_client	*thermostat;
@@ -286,23 +286,23 @@ restore_regs( void )
 
 static int control_loop(void *dummy)
 {
-	down(&x.lock);
+	mutex_lock(&x.lock);
 	setup_hardware();
-	up(&x.lock);
+	mutex_unlock(&x.lock);
 
 	for (;;) {
 		msleep_interruptible(8000);
 		if (kthread_should_stop())
 			break;
 
-		down(&x.lock);
+		mutex_lock(&x.lock);
 		poll_temp();
-		up(&x.lock);
+		mutex_unlock(&x.lock);
 	}
 
-	down(&x.lock);
+	mutex_lock(&x.lock);
 	restore_regs();
-	up(&x.lock);
+	mutex_unlock(&x.lock);
 
 	return 0;
 }
@@ -489,7 +489,7 @@ g4fan_init( void )
 	const struct apple_thermal_info *info;
 	struct device_node *np;
 
-	init_MUTEX( &x.lock );
+	mutex_init(&x.lock);
 
 	if( !(np=of_find_node_by_name(NULL, "power-mgt")) )
 		return -ENODEV;
_

Re: [patch 3/5] macintosh: therm_windtunnel: semaphore to mutex

[Benjamin Herrenschmidt]

On Mon, 2008-06-09 at 16:26 -0700, akpm@linux-foundation.org wrote:
> From: Daniel Walker <dwalker@mvista.com>
> 
> Signed-off-by: Daniel Walker <dwalker@mvista.com>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

> ---
> 
>  drivers/macintosh/therm_windtunnel.c |   16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
> 
> diff -puN drivers/macintosh/therm_windtunnel.c~macintosh-therm_windtunnel-semaphore-to-mutex drivers/macintosh/therm_windtunnel.c
> --- a/drivers/macintosh/therm_windtunnel.c~macintosh-therm_windtunnel-semaphore-to-mutex
> +++ a/drivers/macintosh/therm_windtunnel.c
> @@ -62,7 +62,7 @@ static struct {
>  	volatile int		running;
>  	struct task_struct	*poll_task;
>  	
> -	struct semaphore 	lock;
> +	struct mutex	 	lock;
>  	struct of_device	*of_dev;
>  	
>  	struct i2c_client	*thermostat;
> @@ -286,23 +286,23 @@ restore_regs( void )
>  
>  static int control_loop(void *dummy)
>  {
> -	down(&x.lock);
> +	mutex_lock(&x.lock);
>  	setup_hardware();
> -	up(&x.lock);
> +	mutex_unlock(&x.lock);
>  
>  	for (;;) {
>  		msleep_interruptible(8000);
>  		if (kthread_should_stop())
>  			break;
>  
> -		down(&x.lock);
> +		mutex_lock(&x.lock);
>  		poll_temp();
> -		up(&x.lock);
> +		mutex_unlock(&x.lock);
>  	}
>  
> -	down(&x.lock);
> +	mutex_lock(&x.lock);
>  	restore_regs();
> -	up(&x.lock);
> +	mutex_unlock(&x.lock);
>  
>  	return 0;
>  }
> @@ -489,7 +489,7 @@ g4fan_init( void )
>  	const struct apple_thermal_info *info;
>  	struct device_node *np;
>  
> -	init_MUTEX( &x.lock );
> +	mutex_init(&x.lock);
>  
>  	if( !(np=of_find_node_by_name(NULL, "power-mgt")) )
>  		return -ENODEV;
> _
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-dev