From 3681fd82c5d3f897a3d81421bd0beb642c6d5b05 Mon Sep 17 00:00:00 2001 From: Daniel Walker Date: Tue, 10 Jun 2008 09:26:08 +1000 Subject: [PATCH] --- yaml --- r: 101691 b: refs/heads/master c: 1baaeea00594776978d875a0f618591056a3705a h: refs/heads/master i: 101689: 864711c040e217a1e22488503ed66b7220befed6 101687: f53758a5bda36945a589fad3998cc76e7db151ed v: v3 --- [refs] | 2 +- trunk/drivers/macintosh/therm_windtunnel.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 0591b8a39342..d14f157ef326 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b1e2270ffefb636afd71bbb8bf19aedff0e5ac3d +refs/heads/master: 1baaeea00594776978d875a0f618591056a3705a diff --git a/trunk/drivers/macintosh/therm_windtunnel.c b/trunk/drivers/macintosh/therm_windtunnel.c index 6d9e7ac7122b..3da0a02efd76 100644 --- a/trunk/drivers/macintosh/therm_windtunnel.c +++ b/trunk/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;