From 4a0bed9c9187fc2314e8355c73aa8a2469cff257 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jarod@redhat.com>
Date: Tue, 19 Oct 2010 12:54:05 -0300
Subject: [PATCH] --- yaml --- r: 219481 b: refs/heads/master c:
 a36e83c94ca9bfae8dae8a7ab98f18931f70612d h: refs/heads/master i:   219479:
 ca8efa9cae5bba2c717b7ecd4330475e864ca1a8 v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/staging/lirc/Kconfig         |  2 +-
 trunk/drivers/staging/lirc/lirc_parallel.c | 26 ----------------------
 3 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/[refs] b/[refs]
index d56de89a6f9c..41f241f07c05 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c1cbb7029e81894c056680d61c64741bd2ff246f
+refs/heads/master: a36e83c94ca9bfae8dae8a7ab98f18931f70612d
diff --git a/trunk/drivers/staging/lirc/Kconfig b/trunk/drivers/staging/lirc/Kconfig
index 100c4d4b8125..fa790db75d7e 100644
--- a/trunk/drivers/staging/lirc/Kconfig
+++ b/trunk/drivers/staging/lirc/Kconfig
@@ -53,7 +53,7 @@ config LIRC_ITE8709
 
 config LIRC_PARALLEL
 	tristate "Homebrew Parallel Port Receiver"
-	depends on LIRC_STAGING && PARPORT && !SMP
+	depends on LIRC_STAGING && PARPORT
 	help
 	  Driver for Homebrew Parallel Port Receivers
 
diff --git a/trunk/drivers/staging/lirc/lirc_parallel.c b/trunk/drivers/staging/lirc/lirc_parallel.c
index b8cce87c7032..884904c782d1 100644
--- a/trunk/drivers/staging/lirc/lirc_parallel.c
+++ b/trunk/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>
@@ -579,28 +575,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);