瀏覽代碼

macintosh/therm_windtunnel: Convert semaphore to mutex

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>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Daniel Walker 17 年之前
父節點
當前提交
1baaeea005
共有 1 個文件被更改,包括 8 次插入8 次删除
  1. 8 8
      drivers/macintosh/therm_windtunnel.c

+ 8 - 8
drivers/macintosh/therm_windtunnel.c

@@ -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 )
 
 
 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 )
 	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;