Commit 1baaeea0 authored by Daniel Walker's avatar Daniel Walker Committed by Paul Mackerras

macintosh/therm_windtunnel: Convert semaphore to mutex

Signed-off-by: default avatarDaniel Walker <dwalker@mvista.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent b1e2270f
...@@ -62,7 +62,7 @@ static struct { ...@@ -62,7 +62,7 @@ static struct {
volatile int running; volatile int running;
struct task_struct *poll_task; struct task_struct *poll_task;
struct semaphore lock; struct mutex lock;
struct of_device *of_dev; struct of_device *of_dev;
struct i2c_client *thermostat; struct i2c_client *thermostat;
...@@ -286,23 +286,23 @@ restore_regs( void ) ...@@ -286,23 +286,23 @@ restore_regs( void )
static int control_loop(void *dummy) static int control_loop(void *dummy)
{ {
down(&x.lock); mutex_lock(&x.lock);
setup_hardware(); setup_hardware();
up(&x.lock); mutex_unlock(&x.lock);
for (;;) { for (;;) {
msleep_interruptible(8000); msleep_interruptible(8000);
if (kthread_should_stop()) if (kthread_should_stop())
break; break;
down(&x.lock); mutex_lock(&x.lock);
poll_temp(); poll_temp();
up(&x.lock); mutex_unlock(&x.lock);
} }
down(&x.lock); mutex_lock(&x.lock);
restore_regs(); restore_regs();
up(&x.lock); mutex_unlock(&x.lock);
return 0; return 0;
} }
...@@ -489,7 +489,7 @@ g4fan_init( void ) ...@@ -489,7 +489,7 @@ g4fan_init( void )
const struct apple_thermal_info *info; const struct apple_thermal_info *info;
struct device_node *np; struct device_node *np;
init_MUTEX( &x.lock ); mutex_init(&x.lock);
if( !(np=of_find_node_by_name(NULL, "power-mgt")) ) if( !(np=of_find_node_by_name(NULL, "power-mgt")) )
return -ENODEV; return -ENODEV;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment