提交 a36e83c9 编写于 作者: J Jarod Wilson 提交者: Mauro Carvalho Chehab

[media] lirc_parallel: build on smp and kill dead code

Talked to Christoph Bartelmus about this a bit, and he says this driver
actually *should* work okay on CONFIG_SMP, the check was a legacy one
from the very early days of SMP support before it had stabilized (yes,
this driver is that ancient).

Also remove some completely unused code, only noticed after building
this driver for the first time in an eternity (on an SMP host now, of
course).
Signed-off-by: NJarod Wilson <jarod@redhat.com>
Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
上级 c1cbb702
...@@ -53,7 +53,7 @@ config LIRC_ITE8709 ...@@ -53,7 +53,7 @@ config LIRC_ITE8709
config LIRC_PARALLEL config LIRC_PARALLEL
tristate "Homebrew Parallel Port Receiver" tristate "Homebrew Parallel Port Receiver"
depends on LIRC_STAGING && PARPORT && !SMP depends on LIRC_STAGING && PARPORT
help help
Driver for Homebrew Parallel Port Receivers Driver for Homebrew Parallel Port Receivers
......
...@@ -24,10 +24,6 @@ ...@@ -24,10 +24,6 @@
/*** Includes ***/ /*** Includes ***/
#ifdef CONFIG_SMP
#error "--- Sorry, this driver is not SMP safe. ---"
#endif
#include <linux/module.h> #include <linux/module.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/errno.h> #include <linux/errno.h>
...@@ -579,28 +575,6 @@ static struct lirc_driver driver = { ...@@ -579,28 +575,6 @@ static struct lirc_driver driver = {
static int pf(void *handle); static int pf(void *handle);
static void kf(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) static int pf(void *handle)
{ {
parport_disable_irq(pport); parport_disable_irq(pport);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册