Ver código fonte

[POWERPC] Convert media-bay.c to use the kthread API

We aren't supposed to use kernel_thread directly in drivers any more,
and in fact using kthread_run is a bit simpler.

Signed-off-by: Paul Mackerras <paulus@samba.org>
Paul Mackerras 17 anos atrás
pai
commit
33f6e79406
1 arquivos alterados com 4 adições e 10 exclusões
  1. 4 10
      drivers/macintosh/mediabay.c

+ 4 - 10
drivers/macintosh/mediabay.c

@@ -20,6 +20,7 @@
 #include <linux/stddef.h>
 #include <linux/stddef.h>
 #include <linux/init.h>
 #include <linux/init.h>
 #include <linux/ide.h>
 #include <linux/ide.h>
+#include <linux/kthread.h>
 #include <asm/prom.h>
 #include <asm/prom.h>
 #include <asm/pgtable.h>
 #include <asm/pgtable.h>
 #include <asm/io.h>
 #include <asm/io.h>
@@ -35,7 +36,6 @@
 
 
 
 
 #define MB_DEBUG
 #define MB_DEBUG
-#define MB_IGNORE_SIGNALS
 
 
 #ifdef MB_DEBUG
 #ifdef MB_DEBUG
 #define MBDBG(fmt, arg...)	printk(KERN_INFO fmt , ## arg)
 #define MBDBG(fmt, arg...)	printk(KERN_INFO fmt , ## arg)
@@ -622,12 +622,7 @@ static int media_bay_task(void *x)
 {
 {
 	int	i;
 	int	i;
 
 
-	strcpy(current->comm, "media-bay");
-#ifdef MB_IGNORE_SIGNALS
-	sigfillset(&current->blocked);
-#endif
-
-	for (;;) {
+	while (!kthread_should_stop()) {
 		for (i = 0; i < media_bay_count; ++i) {
 		for (i = 0; i < media_bay_count; ++i) {
 			down(&media_bays[i].lock);
 			down(&media_bays[i].lock);
 			if (!media_bays[i].sleeping)
 			if (!media_bays[i].sleeping)
@@ -636,9 +631,8 @@ static int media_bay_task(void *x)
 		}
 		}
 
 
 		msleep_interruptible(MB_POLL_DELAY);
 		msleep_interruptible(MB_POLL_DELAY);
-		if (signal_pending(current))
-			return 0;
 	}
 	}
+	return 0;
 }
 }
 
 
 static int __devinit media_bay_attach(struct macio_dev *mdev, const struct of_device_id *match)
 static int __devinit media_bay_attach(struct macio_dev *mdev, const struct of_device_id *match)
@@ -699,7 +693,7 @@ static int __devinit media_bay_attach(struct macio_dev *mdev, const struct of_de
 
 
 	/* Startup kernel thread */
 	/* Startup kernel thread */
 	if (i == 0)
 	if (i == 0)
-		kernel_thread(media_bay_task, NULL, CLONE_KERNEL);
+		kthread_run(media_bay_task, NULL, "media-bay");
 
 
 	return 0;
 	return 0;