[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20080512163301.261947548@mvista.com>
Date: Mon, 12 May 2008 09:33:01 -0700
From: Daniel Walker <dwalker@...sta.com>
To: paulus@...ba.org
Cc: benh@...nel.crashing.org, mingo@...e.hu, matthew@....cx,
Matthias Kaehlcke <matthias@...hlcke.net>,
linux-kernel@...r.kernel.org
Subject: [PATCH] macintosh: therm_windtunnel: semaphore to mutex
Signed-off-by: Daniel Walker <dwalker@...sta.com>
---
drivers/macintosh/therm_windtunnel.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
Index: linux-2.6.23/drivers/macintosh/therm_windtunnel.c
===================================================================
--- linux-2.6.23.orig/drivers/macintosh/therm_windtunnel.c
+++ linux-2.6.23/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;
@@ -282,23 +282,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;
}
@@ -485,7 +485,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;
--
--
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists