linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: akpm@linux-foundation.org
Cc: linuxppc-dev@ozlabs.org, paulus@samba.org, dwalker@mvista.com
Subject: Re: [patch 3/5] macintosh: therm_windtunnel: semaphore to mutex
Date: Tue, 10 Jun 2008 09:40:14 +1000	[thread overview]
Message-ID: <1213054814.25745.9.camel@pasglop> (raw)
In-Reply-To: <200806092326.m59NQ9vo014224@imap1.linux-foundation.org>

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

      reply	other threads:[~2008-06-09 23:45 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-06-09 23:26 [patch 3/5] macintosh: therm_windtunnel: semaphore to mutex akpm
2008-06-09 23:40 ` Benjamin Herrenschmidt [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1213054814.25745.9.camel@pasglop \
    --to=benh@kernel.crashing.org \
    --cc=akpm@linux-foundation.org \
    --cc=dwalker@mvista.com \
    --cc=linuxppc-dev@ozlabs.org \
    --cc=paulus@samba.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).