diff options
| author | Andrew Morton <akpm@osdl.org> | 2004-01-18 18:09:06 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2004-01-18 18:09:06 -0800 |
| commit | 07a190a474f513464fea0d40ee853591c0b44d51 (patch) | |
| tree | 9728df6a48d403811590b93e08bc1f0d9bb4f62d /drivers/input/mouse | |
| parent | 665e407eac728b915d97df7d3937ef823dcf1aec (diff) | |
[PATCH] Convert mouse drivers to use module_param
From: Dmitry Torokhov <dtor_core@ameritech.net>
Convert the rest of mouse devices to the new way of handling kernel
parameters and document them in kernel-parameters.txt
Diffstat (limited to 'drivers/input/mouse')
| -rw-r--r-- | drivers/input/mouse/98busmouse.c | 17 | ||||
| -rw-r--r-- | drivers/input/mouse/inport.c | 19 | ||||
| -rw-r--r-- | drivers/input/mouse/logibm.c | 17 |
3 files changed, 13 insertions, 40 deletions
diff --git a/drivers/input/mouse/98busmouse.c b/drivers/input/mouse/98busmouse.c index d578813ee986..94a4882e60a8 100644 --- a/drivers/input/mouse/98busmouse.c +++ b/drivers/input/mouse/98busmouse.c @@ -33,6 +33,7 @@ #include <linux/config.h> #include <linux/module.h> +#include <linux/moduleparam.h> #include <linux/delay.h> #include <linux/ioport.h> #include <linux/init.h> @@ -69,9 +70,10 @@ MODULE_LICENSE("GPL"); #define PC98BM_IRQ 13 -MODULE_PARM(pc98bm_irq, "i"); - static int pc98bm_irq = PC98BM_IRQ; +module_param_named(irq, pc98bm_irq, uint, 0); +MODULE_PARM_DESC(irq, "IRQ number (13=default)"); + static int pc98bm_used = 0; static irqreturn_t pc98bm_interrupt(int irq, void *dev_id, struct pt_regs *regs); @@ -141,17 +143,6 @@ static irqreturn_t pc98bm_interrupt(int irq, void *dev_id, struct pt_regs *regs) return IRQ_HANDLED; } -#ifndef MODULE -static int __init pc98bm_setup(char *str) -{ - int ints[4]; - str = get_options(str, ARRAY_SIZE(ints), ints); - if (ints[0] > 0) pc98bm_irq = ints[1]; - return 1; -} -__setup("pc98bm_irq=", pc98bm_setup); -#endif - static int __init pc98bm_init(void) { int i; diff --git a/drivers/input/mouse/inport.c b/drivers/input/mouse/inport.c index 8b79f2047e3e..c6ff4b49d4bb 100644 --- a/drivers/input/mouse/inport.c +++ b/drivers/input/mouse/inport.c @@ -35,6 +35,7 @@ */ #include <linux/module.h> +#include <linux/moduleparam.h> #include <linux/config.h> #include <linux/ioport.h> #include <linux/init.h> @@ -80,10 +81,11 @@ MODULE_LICENSE("GPL"); #define INPORT_IRQ 5 -MODULE_PARM(inport_irq, "i"); - static int inport_irq = INPORT_IRQ; -static int inport_used = 0; +module_param_named(irq, inport_irq, uint, 0); +MODULE_PARM_DESC(irq, "IRQ number (5=default)"); + +static int inport_used; static irqreturn_t inport_interrupt(int irq, void *dev_id, struct pt_regs *regs); @@ -153,17 +155,6 @@ static irqreturn_t inport_interrupt(int irq, void *dev_id, struct pt_regs *regs) return IRQ_HANDLED; } -#ifndef MODULE -static int __init inport_setup(char *str) -{ - int ints[4]; - str = get_options(str, ARRAY_SIZE(ints), ints); - if (ints[0] > 0) inport_irq = ints[1]; - return 1; -} -__setup("inport_irq=", inport_setup); -#endif - static int __init inport_init(void) { unsigned char a,b,c; diff --git a/drivers/input/mouse/logibm.c b/drivers/input/mouse/logibm.c index afe3d701ef97..6b972dd26735 100644 --- a/drivers/input/mouse/logibm.c +++ b/drivers/input/mouse/logibm.c @@ -36,6 +36,7 @@ */ #include <linux/module.h> +#include <linux/moduleparam.h> #include <linux/delay.h> #include <linux/ioport.h> #include <linux/init.h> @@ -70,9 +71,10 @@ MODULE_LICENSE("GPL"); #define LOGIBM_IRQ 5 -MODULE_PARM(logibm_irq, "i"); - static int logibm_irq = LOGIBM_IRQ; +module_param_named(irq, logibm_irq, uint, 0); +MODULE_PARM_DESC(irq, "IRQ number (5=default)"); + static int logibm_used = 0; static irqreturn_t logibm_interrupt(int irq, void *dev_id, struct pt_regs *regs); @@ -142,17 +144,6 @@ static irqreturn_t logibm_interrupt(int irq, void *dev_id, struct pt_regs *regs) return IRQ_HANDLED; } -#ifndef MODULE -static int __init logibm_setup(char *str) -{ - int ints[4]; - str = get_options(str, ARRAY_SIZE(ints), ints); - if (ints[0] > 0) logibm_irq = ints[1]; - return 1; -} -__setup("logibm_irq=", logibm_setup); -#endif - static int __init logibm_init(void) { if (!request_region(LOGIBM_BASE, LOGIBM_EXTENT, "logibm")) { |