Skip to content

Commit

Permalink
[media] lirc_parallel: build on smp and kill dead code
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jarod Wilson authored and Mauro Carvalho Chehab committed Oct 22, 2010
1 parent c1cbb70 commit a36e83c
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 27 deletions.
2 changes: 1 addition & 1 deletion drivers/staging/lirc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
26 changes: 0 additions & 26 deletions drivers/staging/lirc/lirc_parallel.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit a36e83c

Please sign in to comment.