Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-15 18:04:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Jarod Wilson 2010-10-19 12:54:05 -03:00 committed by Mauro Carvalho Chehab
parent c1cbb7029e
commit a36e83c94c
2 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/lirc/Kconfig
View File

@ -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

26
drivers/staging/lirc/lirc_parallel.c
View File

@ -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);