Skip to content

Commit

Permalink
macintosh/therm_windtunnel: Convert semaphore to mutex
Browse files Browse the repository at this point in the history
Signed-off-by: Daniel Walker <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Acked-by: Benjamin Herrenschmidt <[email protected]>
Signed-off-by: Paul Mackerras <[email protected]>
  • Loading branch information
Daniel Walker authored and paulusmack committed Jun 30, 2008
1 parent b1e2270 commit 1baaeea
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions drivers/macintosh/therm_windtunnel.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 1baaeea

Please sign in to comment.