Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

[net-next-2.6.git] / drivers / staging / lirc / lirc_parallel.c

diff --git a/drivers/staging/lirc/lirc_parallel.c b/drivers/staging/lirc/lirc_parallel.c
index b8cce87c70329633f8842a02429363e50e28dc2e..dfd2c447e67d38aca01dfc833ee23ab6f1e77486 100644 (file)
--- a/drivers/staging/lirc/lirc_parallel.c
+++ b/drivers/staging/lirc/lirc_parallel.c
@@ -24,10 +24,6 @@
 
 /*** Includes ***/
 
-#ifdef CONFIG_SMP
-#error "--- Sorry, this driver is not SMP safe. ---"
-#endif
-
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/errno.h>
@@ -40,7 +36,6 @@
 #include <linux/delay.h>
 
 #include <linux/io.h>
-#include <linux/signal.h>
 #include <linux/irq.h>
 #include <linux/uaccess.h>
 #include <asm/div64.h>
@@ -579,28 +574,6 @@ static struct lirc_driver driver = {
 static int pf(void *handle);
 static void kf(void *handle);
 
-static struct timer_list poll_timer;
-static void poll_state(unsigned long ignored);
-
-static void poll_state(unsigned long ignored)
-{
-       printk(KERN_NOTICE "%s: time\n",
-              LIRC_DRIVER_NAME);
-       del_timer(&poll_timer);
-       if (is_claimed)
-               return;
-       kf(NULL);
-       if (!is_claimed) {
-               printk(KERN_NOTICE "%s: could not claim port, giving up\n",
-                      LIRC_DRIVER_NAME);
-               init_timer(&poll_timer);
-               poll_timer.expires = jiffies + HZ;
-               poll_timer.data = (unsigned long)current;
-               poll_timer.function = poll_state;
-               add_timer(&poll_timer);
-       }
-}
-
 static int pf(void *handle)
 {
        parport_disable_irq(pport);