Pull sgi-drivers-makefile-cleanup into release branch

[linux-2.6-omap-h63xx.git] / drivers / input / joystick / db9.c

diff --git a/drivers/input/joystick/db9.c b/drivers/input/joystick/db9.c
index 499344c72756dcbb6301f4c57101b4c0aa09b54c..dcffc34f30c3c130b7a61d5e8b30cf3c453874a8 100644 (file)
--- a/drivers/input/joystick/db9.c
+++ b/drivers/input/joystick/db9.c
@@ -275,68 +275,70 @@ static unsigned char db9_saturn_read_packet(struct parport *port, unsigned char
 /*
  * db9_saturn_report() analyzes packet and reports.
  */
-static int db9_saturn_report(unsigned char id, unsigned char data[60], struct input_dev *dev, int n, int max_pads)
+static int db9_saturn_report(unsigned char id, unsigned char data[60], struct input_dev *devs[], int n, int max_pads)
 {
+       struct input_dev *dev;
        int tmp, i, j;
 
        tmp = (id == 0x41) ? 60 : 10;
-       for (j = 0; (j < tmp) && (n < max_pads); j += 10, n++) {
+       for (j = 0; j < tmp && n < max_pads; j += 10, n++) {
+               dev = devs[n];
                switch (data[j]) {
                case 0x16: /* multi controller (analog 4 axis) */
-                       input_report_abs(dev + n, db9_abs[5], data[j + 6]);
+                       input_report_abs(dev, db9_abs[5], data[j + 6]);
                case 0x15: /* mission stick (analog 3 axis) */
-                       input_report_abs(dev + n, db9_abs[3], data[j + 4]);
-                       input_report_abs(dev + n, db9_abs[4], data[j + 5]);
+                       input_report_abs(dev, db9_abs[3], data[j + 4]);
+                       input_report_abs(dev, db9_abs[4], data[j + 5]);
                case 0x13: /* racing controller (analog 1 axis) */
-                       input_report_abs(dev + n, db9_abs[2], data[j + 3]);
+                       input_report_abs(dev, db9_abs[2], data[j + 3]);
                case 0x34: /* saturn keyboard (udlr ZXC ASD QE Esc) */
                case 0x02: /* digital pad (digital 2 axis + buttons) */
-                       input_report_abs(dev + n, db9_abs[0], !(data[j + 1] & 128) - !(data[j + 1] & 64));
-                       input_report_abs(dev + n, db9_abs[1], !(data[j + 1] & 32) - !(data[j + 1] & 16));
+                       input_report_abs(dev, db9_abs[0], !(data[j + 1] & 128) - !(data[j + 1] & 64));
+                       input_report_abs(dev, db9_abs[1], !(data[j + 1] & 32) - !(data[j + 1] & 16));
                        for (i = 0; i < 9; i++)
-                               input_report_key(dev + n, db9_cd32_btn[i], ~data[j + db9_saturn_byte[i]] & db9_saturn_mask[i]);
+                               input_report_key(dev, db9_cd32_btn[i], ~data[j + db9_saturn_byte[i]] & db9_saturn_mask[i]);
                        break;
                case 0x19: /* mission stick x2 (analog 6 axis + buttons) */
-                       input_report_abs(dev + n, db9_abs[0], !(data[j + 1] & 128) - !(data[j + 1] & 64));
-                       input_report_abs(dev + n, db9_abs[1], !(data[j + 1] & 32) - !(data[j + 1] & 16));
+                       input_report_abs(dev, db9_abs[0], !(data[j + 1] & 128) - !(data[j + 1] & 64));
+                       input_report_abs(dev, db9_abs[1], !(data[j + 1] & 32) - !(data[j + 1] & 16));
                        for (i = 0; i < 9; i++)
-                               input_report_key(dev + n, db9_cd32_btn[i], ~data[j + db9_saturn_byte[i]] & db9_saturn_mask[i]);
-                       input_report_abs(dev + n, db9_abs[2], data[j + 3]);
-                       input_report_abs(dev + n, db9_abs[3], data[j + 4]);
-                       input_report_abs(dev + n, db9_abs[4], data[j + 5]);
+                               input_report_key(dev, db9_cd32_btn[i], ~data[j + db9_saturn_byte[i]] & db9_saturn_mask[i]);
+                       input_report_abs(dev, db9_abs[2], data[j + 3]);
+                       input_report_abs(dev, db9_abs[3], data[j + 4]);
+                       input_report_abs(dev, db9_abs[4], data[j + 5]);
                        /*
-                       input_report_abs(dev + n, db9_abs[8], (data[j + 6] & 128 ? 0 : 1) - (data[j + 6] & 64 ? 0 : 1));
-                       input_report_abs(dev + n, db9_abs[9], (data[j + 6] & 32 ? 0 : 1) - (data[j + 6] & 16 ? 0 : 1));
+                       input_report_abs(dev, db9_abs[8], (data[j + 6] & 128 ? 0 : 1) - (data[j + 6] & 64 ? 0 : 1));
+                       input_report_abs(dev, db9_abs[9], (data[j + 6] & 32 ? 0 : 1) - (data[j + 6] & 16 ? 0 : 1));
                        */
-                       input_report_abs(dev + n, db9_abs[6], data[j + 7]);
-                       input_report_abs(dev + n, db9_abs[7], data[j + 8]);
-                       input_report_abs(dev + n, db9_abs[5], data[j + 9]);
+                       input_report_abs(dev, db9_abs[6], data[j + 7]);
+                       input_report_abs(dev, db9_abs[7], data[j + 8]);
+                       input_report_abs(dev, db9_abs[5], data[j + 9]);
                        break;
                case 0xd3: /* sankyo ff (analog 1 axis + stop btn) */
-                       input_report_key(dev + n, BTN_A, data[j + 3] & 0x80);
-                       input_report_abs(dev + n, db9_abs[2], data[j + 3] & 0x7f);
+                       input_report_key(dev, BTN_A, data[j + 3] & 0x80);
+                       input_report_abs(dev, db9_abs[2], data[j + 3] & 0x7f);
                        break;
                case 0xe3: /* shuttle mouse (analog 2 axis + buttons. signed value) */
-                       input_report_key(dev + n, BTN_START, data[j + 1] & 0x08);
-                       input_report_key(dev + n, BTN_A, data[j + 1] & 0x04);
-                       input_report_key(dev + n, BTN_C, data[j + 1] & 0x02);
-                       input_report_key(dev + n, BTN_B, data[j + 1] & 0x01);
-                       input_report_abs(dev + n, db9_abs[2], data[j + 2] ^ 0x80);
-                       input_report_abs(dev + n, db9_abs[3], (0xff-(data[j + 3] ^ 0x80))+1); /* */
+                       input_report_key(dev, BTN_START, data[j + 1] & 0x08);
+                       input_report_key(dev, BTN_A, data[j + 1] & 0x04);
+                       input_report_key(dev, BTN_C, data[j + 1] & 0x02);
+                       input_report_key(dev, BTN_B, data[j + 1] & 0x01);
+                       input_report_abs(dev, db9_abs[2], data[j + 2] ^ 0x80);
+                       input_report_abs(dev, db9_abs[3], (0xff-(data[j + 3] ^ 0x80))+1); /* */
                        break;
                case 0xff:
                default: /* no pad */
-                       input_report_abs(dev + n, db9_abs[0], 0);
-                       input_report_abs(dev + n, db9_abs[1], 0);
+                       input_report_abs(dev, db9_abs[0], 0);
+                       input_report_abs(dev, db9_abs[1], 0);
                        for (i = 0; i < 9; i++)
-                               input_report_key(dev + n, db9_cd32_btn[i], 0);
+                               input_report_key(dev, db9_cd32_btn[i], 0);
                        break;
                }
        }
        return n;
 }
 
-static int db9_saturn(int mode, struct parport *port, struct input_dev *dev)
+static int db9_saturn(int mode, struct parport *port, struct input_dev *devs[])
 {
        unsigned char id, data[60];
        int type, n, max_pads;
@@ -361,7 +363,7 @@ static int db9_saturn(int mode, struct parport *port, struct input_dev *dev)
        max_pads = min(db9_modes[mode].n_pads, DB9_MAX_DEVICES);
        for (tmp = 0, i = 0; i < n; i++) {
                id = db9_saturn_read_packet(port, data, type + i, 1);
-               tmp = db9_saturn_report(id, data, dev, tmp, max_pads);
+               tmp = db9_saturn_report(id, data, devs, tmp, max_pads);
        }
        return 0;
 }
@@ -489,7 +491,7 @@ static void db9_timer(unsigned long private)
                case DB9_SATURN_DPP:
                case DB9_SATURN_DPP_2:
 
-                       db9_saturn(db9->mode, port, dev);
+                       db9_saturn(db9->mode, port, db9->dev);
                        break;
 
                case DB9_CD32_PAD:
@@ -614,7 +616,7 @@ static struct db9 __init *db9_probe(int parport, int mode)
                if (!input_dev) {
                        printk(KERN_ERR "db9.c: Not enough memory for input device\n");
                        err = -ENOMEM;
-                       goto err_free_devs;
+                       goto err_unreg_devs;
                }
 
                sprintf(db9->phys[i], "%s/input%d", db9->pd->port->name, i);
@@ -640,13 +642,17 @@ static struct db9 __init *db9_probe(int parport, int mode)
                                input_set_abs_params(input_dev, db9_abs[j], 1, 255, 0, 0);
                }
 
-               input_register_device(input_dev);
+               err = input_register_device(input_dev);
+               if (err)
+                       goto err_free_dev;
        }
 
        parport_put_port(pp);
        return db9;
 
- err_free_devs:
+ err_free_dev:
+       input_free_device(db9->dev[i]);
+ err_unreg_devs:
        while (--i >= 0)
                input_unregister_device(db9->dev[i]);
        kfree(db9);
@@ -658,7 +664,7 @@ static struct db9 __init *db9_probe(int parport, int mode)
        return ERR_PTR(err);
 }
 
-static void __exit db9_remove(struct db9 *db9)
+static void db9_remove(struct db9 *db9)
 {
        int i;
 
@@ -696,7 +702,8 @@ static int __init db9_init(void)
 
        if (err) {
                while (--i >= 0)
-                       db9_remove(db9_base[i]);
+                       if (db9_base[i])
+                               db9_remove(db9_base[i]);
                return err;
        }