aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/joystick/db9.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/input/joystick/db9.c')
-rw-r--r--drivers/input/joystick/db9.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/input/joystick/db9.c b/drivers/input/joystick/db9.c
index c27593bf9978..86ad1027e12a 100644
--- a/drivers/input/joystick/db9.c
+++ b/drivers/input/joystick/db9.c
@@ -46,17 +46,17 @@ MODULE_LICENSE("GPL");
46 46
47struct db9_config { 47struct db9_config {
48 int args[2]; 48 int args[2];
49 int nargs; 49 unsigned int nargs;
50}; 50};
51 51
52#define DB9_MAX_PORTS 3 52#define DB9_MAX_PORTS 3
53static struct db9_config db9[DB9_MAX_PORTS] __initdata; 53static struct db9_config db9_cfg[DB9_MAX_PORTS] __initdata;
54 54
55module_param_array_named(dev, db9[0].args, int, &db9[0].nargs, 0); 55module_param_array_named(dev, db9_cfg[0].args, int, &db9_cfg[0].nargs, 0);
56MODULE_PARM_DESC(dev, "Describes first attached device (<parport#>,<type>)"); 56MODULE_PARM_DESC(dev, "Describes first attached device (<parport#>,<type>)");
57module_param_array_named(dev2, db9[1].args, int, &db9[0].nargs, 0); 57module_param_array_named(dev2, db9_cfg[1].args, int, &db9_cfg[0].nargs, 0);
58MODULE_PARM_DESC(dev2, "Describes second attached device (<parport#>,<type>)"); 58MODULE_PARM_DESC(dev2, "Describes second attached device (<parport#>,<type>)");
59module_param_array_named(dev3, db9[2].args, int, &db9[2].nargs, 0); 59module_param_array_named(dev3, db9_cfg[2].args, int, &db9_cfg[2].nargs, 0);
60MODULE_PARM_DESC(dev3, "Describes third attached device (<parport#>,<type>)"); 60MODULE_PARM_DESC(dev3, "Describes third attached device (<parport#>,<type>)");
61 61
62#define DB9_ARG_PARPORT 0 62#define DB9_ARG_PARPORT 0
@@ -680,17 +680,17 @@ static int __init db9_init(void)
680 int err = 0; 680 int err = 0;
681 681
682 for (i = 0; i < DB9_MAX_PORTS; i++) { 682 for (i = 0; i < DB9_MAX_PORTS; i++) {
683 if (db9[i].nargs == 0 || db9[i].args[DB9_ARG_PARPORT] < 0) 683 if (db9_cfg[i].nargs == 0 || db9_cfg[i].args[DB9_ARG_PARPORT] < 0)
684 continue; 684 continue;
685 685
686 if (db9[i].nargs < 2) { 686 if (db9_cfg[i].nargs < 2) {
687 printk(KERN_ERR "db9.c: Device type must be specified.\n"); 687 printk(KERN_ERR "db9.c: Device type must be specified.\n");
688 err = -EINVAL; 688 err = -EINVAL;
689 break; 689 break;
690 } 690 }
691 691
692 db9_base[i] = db9_probe(db9[i].args[DB9_ARG_PARPORT], 692 db9_base[i] = db9_probe(db9_cfg[i].args[DB9_ARG_PARPORT],
693 db9[i].args[DB9_ARG_MODE]); 693 db9_cfg[i].args[DB9_ARG_MODE]);
694 if (IS_ERR(db9_base[i])) { 694 if (IS_ERR(db9_base[i])) {
695 err = PTR_ERR(db9_base[i]); 695 err = PTR_ERR(db9_base[i]);
696 break; 696 break;