From 07a190a474f513464fea0d40ee853591c0b44d51 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Sun, 18 Jan 2004 18:09:06 -0800 Subject: [PATCH] [PATCH] Convert mouse drivers to use module_param From: Dmitry Torokhov Convert the rest of mouse devices to the new way of handling kernel parameters and document them in kernel-parameters.txt --- Documentation/kernel-parameters.txt | 12 ++++++++++-- drivers/input/mouse/98busmouse.c | 17 ++++------------- drivers/input/mouse/inport.c | 19 +++++-------------- drivers/input/mouse/logibm.c | 17 ++++------------- drivers/input/mousedev.c | 17 +++++++++-------- 5 files changed, 32 insertions(+), 50 deletions(-) diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 87b2beab4b593..15cb616a5e891 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -85,6 +85,9 @@ running once the system is up. See header of drivers/scsi/53c7xx.c. See also Documentation/scsi/ncr53c7xx.txt. + 98busmouse.irq= [HW,MOUSE] PC-9801 Bus Mouse Driver + Format: , default is 13 + acpi= [HW,ACPI] Advanced Configuration and Power Interface Format: { force | off | ht } force -- enables ACPI for systems with default off @@ -417,7 +420,7 @@ running once the system is up. initrd= [BOOT] Specify the location of the initial ramdisk - inport_irq= [HW] Inport (ATI XL and Microsoft) busmouse driver + inport.irq= [HW] Inport (ATI XL and Microsoft) busmouse driver Format: inttest= [IA64] @@ -465,7 +468,7 @@ running once the system is up. lockd.tcpport= [NFS] - logibm_irq= [HW,MOUSE] Logitech Bus Mouse Driver + logibm.irq= [HW,MOUSE] Logitech Bus Mouse Driver Format: log_buf_len=n Sets the size of the printk ring buffer, in bytes. @@ -565,6 +568,11 @@ running once the system is up. mga= [HW,DRM] + mousedev.xres [MOUSE] Horizontal screen resolution, used for devices + reporting absolute coordinates, such as tablets + mousedev.yres [MOUSE] Vertical screen resolution, used for devices + reporting absolute coordinates, such as tablets + mpu401= [HW,OSS] Format: , diff --git a/drivers/input/mouse/98busmouse.c b/drivers/input/mouse/98busmouse.c index d578813ee9869..94a4882e60a86 100644 --- a/drivers/input/mouse/98busmouse.c +++ b/drivers/input/mouse/98busmouse.c @@ -33,6 +33,7 @@ #include #include +#include #include #include #include @@ -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 8b79f2047e3e7..c6ff4b49d4bbc 100644 --- a/drivers/input/mouse/inport.c +++ b/drivers/input/mouse/inport.c @@ -35,6 +35,7 @@ */ #include +#include #include #include #include @@ -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 afe3d701ef97d..6b972dd267351 100644 --- a/drivers/input/mouse/logibm.c +++ b/drivers/input/mouse/logibm.c @@ -36,6 +36,7 @@ */ #include +#include #include #include #include @@ -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")) { diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c index 8c3da96ab721d..c9e96e4913557 100644 --- a/drivers/input/mousedev.c +++ b/drivers/input/mousedev.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -38,6 +39,14 @@ MODULE_LICENSE("GPL"); #define CONFIG_INPUT_MOUSEDEV_SCREEN_Y 768 #endif +static int xres = CONFIG_INPUT_MOUSEDEV_SCREEN_X; +module_param(xres, uint, 0); +MODULE_PARM_DESC(xres, "Horizontal screen resolution"); + +static int yres = CONFIG_INPUT_MOUSEDEV_SCREEN_Y; +module_param(yres, uint, 0); +MODULE_PARM_DESC(yres, "Vertical screen resolution"); + struct mousedev { int exist; int open; @@ -73,9 +82,6 @@ static struct input_handler mousedev_handler; static struct mousedev *mousedev_table[MOUSEDEV_MINORS]; static struct mousedev mousedev_mix; -static int xres = CONFIG_INPUT_MOUSEDEV_SCREEN_X; -static int yres = CONFIG_INPUT_MOUSEDEV_SCREEN_Y; - #define fx(i) (list->old_x[(list->pkt_count - (i)) & 03]) #define fy(i) (list->old_y[(list->pkt_count - (i)) & 03]) @@ -582,8 +588,3 @@ static void __exit mousedev_exit(void) module_init(mousedev_init); module_exit(mousedev_exit); - -MODULE_PARM(xres, "i"); -MODULE_PARM_DESC(xres, "Horizontal screen resolution"); -MODULE_PARM(yres, "i"); -MODULE_PARM_DESC(yres, "Vertical screen resolution"); -- 2.53.0