Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6-omap-h63xx.git] / drivers / input / mouse / logibm.c

diff --git a/drivers/input/mouse/logibm.c b/drivers/input/mouse/logibm.c
index 8b5243167227ba364315cedc9f5d4e06696d682a..26c3b2e2ca94a3eff06a3ef800f59f78a19f5c58 100644 (file)
--- a/drivers/input/mouse/logibm.c
+++ b/drivers/input/mouse/logibm.c
@@ -75,43 +75,9 @@ static int logibm_irq = LOGIBM_IRQ;
 module_param_named(irq, logibm_irq, uint, 0);
 MODULE_PARM_DESC(irq, "IRQ number (5=default)");
 
-__obsolete_setup("logibm_irq=");
+static struct input_dev *logibm_dev;
 
-static irqreturn_t logibm_interrupt(int irq, void *dev_id, struct pt_regs *regs);
-
-static int logibm_open(struct input_dev *dev)
-{
-       if (request_irq(logibm_irq, logibm_interrupt, 0, "logibm", NULL)) {
-               printk(KERN_ERR "logibm.c: Can't allocate irq %d\n", logibm_irq);
-               return -EBUSY;
-       }
-       outb(LOGIBM_ENABLE_IRQ, LOGIBM_CONTROL_PORT);
-       return 0;
-}
-
-static void logibm_close(struct input_dev *dev)
-{
-       outb(LOGIBM_DISABLE_IRQ, LOGIBM_CONTROL_PORT);
-       free_irq(logibm_irq, NULL);
-}
-
-static struct input_dev logibm_dev = {
-       .evbit  = { BIT(EV_KEY) | BIT(EV_REL) },
-       .keybit = { [LONG(BTN_LEFT)] = BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT) },
-       .relbit = { BIT(REL_X) | BIT(REL_Y) },
-       .open   = logibm_open,
-       .close  = logibm_close,
-       .name   = "Logitech bus mouse",
-       .phys   = "isa023c/input0",
-       .id     = {
-               .bustype = BUS_ISA,
-               .vendor  = 0x0003,
-               .product = 0x0001,
-               .version = 0x0100,
-       },
-};
-
-static irqreturn_t logibm_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t logibm_interrupt(int irq, void *dev_id)
 {
        char dx, dy;
        unsigned char buttons;
@@ -127,20 +93,37 @@ static irqreturn_t logibm_interrupt(int irq, void *dev_id, struct pt_regs *regs)
        dy |= (buttons & 0xf) << 4;
        buttons = ~buttons >> 5;
 
-       input_regs(&logibm_dev, regs);
-       input_report_rel(&logibm_dev, REL_X, dx);
-       input_report_rel(&logibm_dev, REL_Y, dy);
-       input_report_key(&logibm_dev, BTN_RIGHT,  buttons & 1);
-       input_report_key(&logibm_dev, BTN_MIDDLE, buttons & 2);
-       input_report_key(&logibm_dev, BTN_LEFT,   buttons & 4);
-       input_sync(&logibm_dev);
+       input_report_rel(logibm_dev, REL_X, dx);
+       input_report_rel(logibm_dev, REL_Y, dy);
+       input_report_key(logibm_dev, BTN_RIGHT,  buttons & 1);
+       input_report_key(logibm_dev, BTN_MIDDLE, buttons & 2);
+       input_report_key(logibm_dev, BTN_LEFT,   buttons & 4);
+       input_sync(logibm_dev);
 
        outb(LOGIBM_ENABLE_IRQ, LOGIBM_CONTROL_PORT);
        return IRQ_HANDLED;
 }
 
+static int logibm_open(struct input_dev *dev)
+{
+       if (request_irq(logibm_irq, logibm_interrupt, 0, "logibm", NULL)) {
+               printk(KERN_ERR "logibm.c: Can't allocate irq %d\n", logibm_irq);
+               return -EBUSY;
+       }
+       outb(LOGIBM_ENABLE_IRQ, LOGIBM_CONTROL_PORT);
+       return 0;
+}
+
+static void logibm_close(struct input_dev *dev)
+{
+       outb(LOGIBM_DISABLE_IRQ, LOGIBM_CONTROL_PORT);
+       free_irq(logibm_irq, NULL);
+}
+
 static int __init logibm_init(void)
 {
+       int err;
+
        if (!request_region(LOGIBM_BASE, LOGIBM_EXTENT, "logibm")) {
                printk(KERN_ERR "logibm.c: Can't allocate ports at %#x\n", LOGIBM_BASE);
                return -EBUSY;
@@ -151,24 +134,52 @@ static int __init logibm_init(void)
        udelay(100);
 
        if (inb(LOGIBM_SIGNATURE_PORT) != LOGIBM_SIGNATURE_BYTE) {
-               release_region(LOGIBM_BASE, LOGIBM_EXTENT);
                printk(KERN_ERR "logibm.c: Didn't find Logitech busmouse at %#x\n", LOGIBM_BASE);
-               return -ENODEV;
+               err = -ENODEV;
+               goto err_release_region;
        }
 
        outb(LOGIBM_DEFAULT_MODE, LOGIBM_CONFIG_PORT);
        outb(LOGIBM_DISABLE_IRQ, LOGIBM_CONTROL_PORT);
 
-       input_register_device(&logibm_dev);
+       logibm_dev = input_allocate_device();
+       if (!logibm_dev) {
+               printk(KERN_ERR "logibm.c: Not enough memory for input device\n");
+               err = -ENOMEM;
+               goto err_release_region;
+       }
+
+       logibm_dev->name = "Logitech bus mouse";
+       logibm_dev->phys = "isa023c/input0";
+       logibm_dev->id.bustype = BUS_ISA;
+       logibm_dev->id.vendor  = 0x0003;
+       logibm_dev->id.product = 0x0001;
+       logibm_dev->id.version = 0x0100;
 
-       printk(KERN_INFO "input: Logitech bus mouse at %#x irq %d\n", LOGIBM_BASE, logibm_irq);
+       logibm_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REL);
+       logibm_dev->keybit[LONG(BTN_LEFT)] = BIT(BTN_LEFT) | BIT(BTN_MIDDLE) | BIT(BTN_RIGHT);
+       logibm_dev->relbit[0] = BIT(REL_X) | BIT(REL_Y);
+
+       logibm_dev->open  = logibm_open;
+       logibm_dev->close = logibm_close;
+
+       err = input_register_device(logibm_dev);
+       if (err)
+               goto err_free_dev;
 
        return 0;
+
+ err_free_dev:
+       input_free_device(logibm_dev);
+ err_release_region:
+       release_region(LOGIBM_BASE, LOGIBM_EXTENT);
+
+       return err;
 }
 
 static void __exit logibm_exit(void)
 {
-       input_unregister_device(&logibm_dev);
+       input_unregister_device(logibm_dev);
        release_region(LOGIBM_BASE, LOGIBM_EXTENT);
 }