diff options
Diffstat (limited to 'drivers/staging/media/lirc')
| -rw-r--r-- | drivers/staging/media/lirc/lirc_parallel.c | 6 | ||||
| -rw-r--r-- | drivers/staging/media/lirc/lirc_serial.c | 12 | ||||
| -rw-r--r-- | drivers/staging/media/lirc/lirc_sir.c | 6 |
3 files changed, 14 insertions, 10 deletions
diff --git a/drivers/staging/media/lirc/lirc_parallel.c b/drivers/staging/media/lirc/lirc_parallel.c index dd2bca7b56fa..ec14bc81851b 100644 --- a/drivers/staging/media/lirc/lirc_parallel.c +++ b/drivers/staging/media/lirc/lirc_parallel.c @@ -583,12 +583,12 @@ static struct lirc_driver driver = { static struct platform_device *lirc_parallel_dev; -static int __devinit lirc_parallel_probe(struct platform_device *dev) +static int lirc_parallel_probe(struct platform_device *dev) { return 0; } -static int __devexit lirc_parallel_remove(struct platform_device *dev) +static int lirc_parallel_remove(struct platform_device *dev) { return 0; } @@ -606,7 +606,7 @@ static int lirc_parallel_resume(struct platform_device *dev) static struct platform_driver lirc_parallel_driver = { .probe = lirc_parallel_probe, - .remove = __devexit_p(lirc_parallel_remove), + .remove = lirc_parallel_remove, .suspend = lirc_parallel_suspend, .resume = lirc_parallel_resume, .driver = { diff --git a/drivers/staging/media/lirc/lirc_serial.c b/drivers/staging/media/lirc/lirc_serial.c index 97ef67036e3f..b5d0088f3102 100644 --- a/drivers/staging/media/lirc/lirc_serial.c +++ b/drivers/staging/media/lirc/lirc_serial.c @@ -841,7 +841,7 @@ static int hardware_init_port(void) return 0; } -static int __devinit lirc_serial_probe(struct platform_device *dev) +static int lirc_serial_probe(struct platform_device *dev) { int i, nlow, nhigh, result; @@ -927,7 +927,7 @@ exit_free_irq: return result; } -static int __devexit lirc_serial_remove(struct platform_device *dev) +static int lirc_serial_remove(struct platform_device *dev) { free_irq(irq, (void *)&hardware); @@ -1148,7 +1148,7 @@ static int lirc_serial_resume(struct platform_device *dev) static struct platform_driver lirc_serial_driver = { .probe = lirc_serial_probe, - .remove = __devexit_p(lirc_serial_remove), + .remove = lirc_serial_remove, .suspend = lirc_serial_suspend, .resume = lirc_serial_resume, .driver = { @@ -1239,6 +1239,10 @@ static int __init lirc_serial_init_module(void) } } + /* make sure sense is either -1, 0, or 1 */ + if (sense != -1) + sense = !!sense; + result = lirc_serial_init(); if (result) return result; @@ -1298,7 +1302,7 @@ MODULE_PARM_DESC(irq, "Interrupt (4 or 3)"); module_param(share_irq, bool, S_IRUGO); MODULE_PARM_DESC(share_irq, "Share interrupts (0 = off, 1 = on)"); -module_param(sense, bool, S_IRUGO); +module_param(sense, int, S_IRUGO); MODULE_PARM_DESC(sense, "Override autodetection of IR receiver circuit" " (0 = active high, 1 = active low )"); diff --git a/drivers/staging/media/lirc/lirc_sir.c b/drivers/staging/media/lirc/lirc_sir.c index 4afc3b419738..a45799874a21 100644 --- a/drivers/staging/media/lirc/lirc_sir.c +++ b/drivers/staging/media/lirc/lirc_sir.c @@ -1218,19 +1218,19 @@ static int init_lirc_sir(void) return 0; } -static int __devinit lirc_sir_probe(struct platform_device *dev) +static int lirc_sir_probe(struct platform_device *dev) { return 0; } -static int __devexit lirc_sir_remove(struct platform_device *dev) +static int lirc_sir_remove(struct platform_device *dev) { return 0; } static struct platform_driver lirc_sir_driver = { .probe = lirc_sir_probe, - .remove = __devexit_p(lirc_sir_remove), + .remove = lirc_sir_remove, .driver = { .name = "lirc_sir", .owner = THIS_MODULE, |