Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / input / joystick / warrior.c

diff --git a/drivers/input/joystick/warrior.c b/drivers/input/joystick/warrior.c
index 53d535b..1849b17 100644 (file)
--- a/drivers/input/joystick/warrior.c
+++ b/drivers/input/joystick/warrior.c
@@ -47,14 +47,13 @@ MODULE_LICENSE("GPL");
 
 #define WARRIOR_MAX_LENGTH     16
 static char warrior_lengths[] = { 0, 4, 12, 3, 4, 4, 0, 0 };
-static char *warrior_name = "Logitech WingMan Warrior";
 
 /*
  * Per-Warrior data.
  */
 
 struct warrior {
-       struct input_dev dev;
+       struct input_dev *dev;
        int idx, len;
        unsigned char data[WARRIOR_MAX_LENGTH];
        char phys[32];
@@ -67,7 +66,7 @@ struct warrior {
 
 static void warrior_process_packet(struct warrior *warrior, struct pt_regs *regs)
 {
-       struct input_dev *dev = &warrior->dev;
+       struct input_dev *dev = warrior->dev;
        unsigned char *data = warrior->data;
 
        if (!warrior->idx) return;
@@ -104,7 +103,7 @@ static void warrior_process_packet(struct warrior *warrior, struct pt_regs *regs
 static irqreturn_t warrior_interrupt(struct serio *serio,
                unsigned char data, unsigned int flags, struct pt_regs *regs)
 {
-       struct warrior* warrior = serio->private;
+       struct warrior *warrior = serio_get_drvdata(serio);
 
        if (data & 0x80) {
                if (warrior->idx) warrior_process_packet(warrior, regs);
@@ -129,9 +128,11 @@ static irqreturn_t warrior_interrupt(struct serio *serio,
 
 static void warrior_disconnect(struct serio *serio)
 {
-       struct warrior* warrior = serio->private;
-       input_unregister_device(&warrior->dev);
+       struct warrior *warrior = serio_get_drvdata(serio);
+
        serio_close(serio);
+       serio_set_drvdata(serio, NULL);
+       input_unregister_device(warrior->dev);
        kfree(warrior);
 }
 
@@ -141,72 +142,75 @@ static void warrior_disconnect(struct serio *serio)
  * it as an input device.
  */
 
-static void warrior_connect(struct serio *serio, struct serio_driver *drv)
+static int warrior_connect(struct serio *serio, struct serio_driver *drv)
 {
        struct warrior *warrior;
-       int i;
-
-       if (serio->type != (SERIO_RS232 | SERIO_WARRIOR))
-               return;
-
-       if (!(warrior = kmalloc(sizeof(struct warrior), GFP_KERNEL)))
-               return;
+       struct input_dev *input_dev;
+       int err = -ENOMEM;
 
-       memset(warrior, 0, sizeof(struct warrior));
-
-       warrior->dev.evbit[0] = BIT(EV_KEY) | BIT(EV_REL) | BIT(EV_ABS);
-       warrior->dev.keybit[LONG(BTN_TRIGGER)] = BIT(BTN_TRIGGER) | BIT(BTN_THUMB) | BIT(BTN_TOP) | BIT(BTN_TOP2);
-       warrior->dev.relbit[0] = BIT(REL_DIAL);
-       warrior->dev.absbit[0] = BIT(ABS_X) | BIT(ABS_Y) | BIT(ABS_THROTTLE) | BIT(ABS_HAT0X) | BIT(ABS_HAT0Y);
+       warrior = kzalloc(sizeof(struct warrior), GFP_KERNEL);
+       input_dev = input_allocate_device();
+       if (!warrior || !input_dev)
+               goto fail;
 
+       warrior->dev = input_dev;
        sprintf(warrior->phys, "%s/input0", serio->phys);
 
-       init_input_dev(&warrior->dev);
-       warrior->dev.name = warrior_name;
-       warrior->dev.phys = warrior->phys;
-       warrior->dev.id.bustype = BUS_RS232;
-       warrior->dev.id.vendor = SERIO_WARRIOR;
-       warrior->dev.id.product = 0x0001;
-       warrior->dev.id.version = 0x0100;
-       warrior->dev.dev = &serio->dev;
-
-       for (i = 0; i < 2; i++) {
-               warrior->dev.absmax[ABS_X+i] = -64;
-               warrior->dev.absmin[ABS_X+i] =  64;
-               warrior->dev.absflat[ABS_X+i] = 8;
-       }
-
-       warrior->dev.absmax[ABS_THROTTLE] = -112;
-       warrior->dev.absmin[ABS_THROTTLE] =  112;
-
-       for (i = 0; i < 2; i++) {
-               warrior->dev.absmax[ABS_HAT0X+i] = -1;
-               warrior->dev.absmin[ABS_HAT0X+i] =  1;
-       }
-
-       warrior->dev.private = warrior;
-
-       serio->private = warrior;
-
-       if (serio_open(serio, drv)) {
-               kfree(warrior);
-               return;
-       }
-
-       input_register_device(&warrior->dev);
+       input_dev->name = "Logitech WingMan Warrior";
+       input_dev->phys = warrior->phys;
+       input_dev->id.bustype = BUS_RS232;
+       input_dev->id.vendor = SERIO_WARRIOR;
+       input_dev->id.product = 0x0001;
+       input_dev->id.version = 0x0100;
+       input_dev->cdev.dev = &serio->dev;
+       input_dev->private = warrior;
+
+       input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL) | BIT(EV_ABS);
+       input_dev->keybit[LONG(BTN_TRIGGER)] = BIT(BTN_TRIGGER) | BIT(BTN_THUMB) | BIT(BTN_TOP) | BIT(BTN_TOP2);
+       input_dev->relbit[0] = BIT(REL_DIAL);
+       input_set_abs_params(input_dev, ABS_X, -64, 64, 0, 8);
+       input_set_abs_params(input_dev, ABS_Y, -64, 64, 0, 8);
+       input_set_abs_params(input_dev, ABS_THROTTLE, -112, 112, 0, 0);
+       input_set_abs_params(input_dev, ABS_HAT0X, -1, 1, 0, 0);
+       input_set_abs_params(input_dev, ABS_HAT0Y, -1, 1, 0, 0);
+
+       serio_set_drvdata(serio, warrior);
+
+       err = serio_open(serio, drv);
+       if (err)
+               goto fail;
+
+       input_register_device(warrior->dev);
+       return 0;
 
-       printk(KERN_INFO "input: Logitech WingMan Warrior on %s\n", serio->phys);
+ fail: serio_set_drvdata(serio, NULL);
+       input_free_device(input_dev);
+       kfree(warrior);
+       return err;
 }
 
 /*
- * The serio device structure.
+ * The serio driver structure.
  */
 
+static struct serio_device_id warrior_serio_ids[] = {
+       {
+               .type   = SERIO_RS232,
+               .proto  = SERIO_WARRIOR,
+               .id     = SERIO_ANY,
+               .extra  = SERIO_ANY,
+       },
+       { 0 }
+};
+
+MODULE_DEVICE_TABLE(serio, warrior_serio_ids);
+
 static struct serio_driver warrior_drv = {
        .driver         = {
                .name   = "warrior",
        },
        .description    = DRIVER_DESC,
+       .id_table       = warrior_serio_ids,
        .interrupt      = warrior_interrupt,
        .connect        = warrior_connect,
        .disconnect     = warrior_disconnect,
@@ -216,13 +220,13 @@ static struct serio_driver warrior_drv = {
  * The functions for inserting/removing us as a module.
  */
 
-int __init warrior_init(void)
+static int __init warrior_init(void)
 {
        serio_register_driver(&warrior_drv);
        return 0;
 }
 
-void __exit warrior_exit(void)
+static void __exit warrior_exit(void)
 {
        serio_unregister_driver(&warrior_drv);
 }