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).
Showing the changes to drivers/staging/lirc (2 of 2 files). Show all
Unified · Split
| @@ -53,7 +53,7 @@ config LIRC_ITE8709 · 52 unmodified lines | |||
| 53 | 53 | ||
| 54 | config LIRC_PARALLEL | 54 | config LIRC_PARALLEL |
| 55 | tristate "Homebrew Parallel Port Receiver" | 55 | tristate "Homebrew Parallel Port Receiver" |
| 56 | depends on LIRC_STAGING && PARPORT && !SMP | 56 | depends on LIRC_STAGING && PARPORT |
| 57 | help | 57 | help |
| 58 | Driver for Homebrew Parallel Port Receivers | 58 | Driver for Homebrew Parallel Port Receivers |
| 59 | 59 | ||
| @@ -24,10 +24,6 @@ · 23 unmodified lines | |||
| 24 | 24 | ||
| 25 | /*** Includes ***/ | 25 | /*** Includes ***/ |
| 26 | 26 | ||
| 27 | #ifdef CONFIG_SMP | ||
| 28 | #error "--- Sorry, this driver is not SMP safe. ---" | ||
| 29 | #endif | ||
| 30 | |||
| 31 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 32 | #include <linux/sched.h> | 28 | #include <linux/sched.h> |
| 33 | #include <linux/errno.h> | 29 | #include <linux/errno.h> |
| @@ -579,28 +575,6 @@ static struct lirc_driver driver = { · 545 unmodified lines | |||
| 579 | static int pf(void *handle); | 575 | static int pf(void *handle); |
| 580 | static void kf(void *handle); | 576 | static void kf(void *handle); |
| 581 | 577 | ||
| 582 | static struct timer_list poll_timer; | ||
| 583 | static void poll_state(unsigned long ignored); | ||
| 584 | |||
| 585 | static void poll_state(unsigned long ignored) | ||
| 586 | { | ||
| 587 | printk(KERN_NOTICE "%s: time\n", | ||
| 588 | LIRC_DRIVER_NAME); | ||
| 589 | del_timer(&poll_timer); | ||
| 590 | if (is_claimed) | ||
| 591 | return; | ||
| 592 | kf(NULL); | ||
| 593 | if (!is_claimed) { | ||
| 594 | printk(KERN_NOTICE "%s: could not claim port, giving up\n", | ||
| 595 | LIRC_DRIVER_NAME); | ||
| 596 | init_timer(&poll_timer); | ||
| 597 | poll_timer.expires = jiffies + HZ; | ||
| 598 | poll_timer.data = (unsigned long)current; | ||
| 599 | poll_timer.function = poll_state; | ||
| 600 | add_timer(&poll_timer); | ||
| 601 | } | ||
| 602 | } | ||
| 603 | |||
| 604 | static int pf(void *handle) | 578 | static int pf(void *handle) |
| 605 | { | 579 | { |
| 606 | parport_disable_irq(pport); | 580 | parport_disable_irq(pport); |