V4L/DVB (5208): Kthread API conversion for dvb_frontend and av7110

dvb kernel_thread to kthread API port.  
It is running fine here, including module load/unload and software suspend
(which doesn't work as expected with or without this patch :).
I didn't convert the dvb_ca_en50221 as I do not have such an interface, but
if the conversion process is fine with the v4l-dvb maintainers, it should not
be a problem to send a patch for that too ...
Acked-by: Oliver Endriss <o.endriss@gmx.de>

Signed-off-by: Herbert Poetzl <herbert@13thfloor.at>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Acked-by: Oliver Endriss <o.endriss@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 13 insertions, 16 deletions

diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index bb213d836c90..29ed532ba966 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -51,6 +51,7 @@
 #include <linux/firmware.h>
 #include <linux/crc32.h>
 #include <linux/i2c.h>
+#include <linux/kthread.h>
 
 #include <asm/system.h>
 
@@ -223,11 +224,10 @@ static void recover_arm(struct av7110 *av7110)
 
 static void av7110_arm_sync(struct av7110 *av7110)
 {
-        av7110->arm_rmmod = 1;
-        wake_up_interruptible(&av7110->arm_wait);
+        if (av7110->arm_thread)
+                kthread_stop(av7110->arm_thread);
 
-        while (av7110->arm_thread)
-                msleep(1);
+        av7110->arm_thread = NULL;
 }
 
 static int arm_thread(void *data)
@@ -238,17 +238,11 @@ static int arm_thread(void *data)
 
         dprintk(4, "%p\n",av7110);
 
-        lock_kernel();
-        daemonize("arm_mon");
-        sigfillset(&current->blocked);
-        unlock_kernel();
-
-        av7110->arm_thread = current;
-
         for (;;) {
                 timeout = wait_event_interruptible_timeout(av7110->arm_wait,
-                                                           av7110->arm_rmmod, 5 * HZ);
-                if (-ERESTARTSYS == timeout || av7110->arm_rmmod) {
+                        kthread_should_stop(), 5 * HZ);
+
+                if (-ERESTARTSYS == timeout || kthread_should_stop()) {
                         /* got signal or told to quit*/
                         break;
                 }
@@ -276,7 +270,6 @@ static int arm_thread(void *data)
                 av7110->arm_errors = 0;
         }
 
-        av7110->arm_thread = NULL;
         return 0;
 }
 
@@ -2338,6 +2331,7 @@ static int __devinit av7110_attach(struct saa7146_dev* dev,
         const int length = TS_WIDTH * TS_HEIGHT;
         struct pci_dev *pdev = dev->pci;
         struct av7110 *av7110;
+        struct task_struct *thread;
         int ret, count = 0;
 
         dprintk(4, "dev: %p\n", dev);
@@ -2622,9 +2616,12 @@ static int __devinit av7110_attach(struct saa7146_dev* dev,
                 printk ("dvb-ttpci: Warning, firmware version 0x%04x is too old. "
                         "System might be unstable!\n", FW_VERSION(av7110->arm_app));
 
-        ret = kernel_thread(arm_thread, (void *) av7110, 0);
-        if (ret < 0)
+        thread = kthread_run(arm_thread, (void *) av7110, "arm_mon");
+        if (IS_ERR(thread)) {
+                ret = PTR_ERR(thread);
                 goto err_stop_arm_9;
+        }
+        av7110->arm_thread = thread;
 
         /* set initial volume in mixer struct */
         av7110->mixer.volume_left  = volume;