x86: replace outb_p() with udelay(2) in drivers/input/mouse/pc110pad.c

[sfrench/cifs-2.6.git] / drivers / input / mouse / pc110pad.c

diff --git a/drivers/input/mouse/pc110pad.c b/drivers/input/mouse/pc110pad.c
index 8c075aa7223b58978f61bd7924cb77b17f1f7237..61cff8374e6c0047f54779e358563745ee7b8226 100644 (file)
--- a/drivers/input/mouse/pc110pad.c
+++ b/drivers/input/mouse/pc110pad.c
@@ -39,6 +39,7 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/pci.h>
+#include <linux/delay.h>
 
 #include <asm/io.h>
 #include <asm/irq.h>
@@ -62,8 +63,10 @@ static irqreturn_t pc110pad_interrupt(int irq, void *ptr)
        int value     = inb_p(pc110pad_io);
        int handshake = inb_p(pc110pad_io + 2);
 
-       outb_p(handshake |  1, pc110pad_io + 2);
-       outb_p(handshake & ~1, pc110pad_io + 2);
+       outb(handshake |  1, pc110pad_io + 2);
+       udelay(2);
+       outb(handshake & ~1, pc110pad_io + 2);
+       udelay(2);
        inb_p(0x64);
 
        pc110pad_data[pc110pad_count++] = value;
@@ -108,11 +111,12 @@ static int pc110pad_open(struct input_dev *dev)
 static int __init pc110pad_init(void)
 {
        struct pci_dev *dev;
+       int err;
 
        dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, NULL);
        if (dev) {
                pci_dev_put(dev);
-               return -ENOENT;
+               return -ENODEV;
        }
 
        if (!request_region(pc110pad_io, 4, "pc110pad")) {
@@ -124,16 +128,16 @@ static int __init pc110pad_init(void)
        outb(PC110PAD_OFF, pc110pad_io + 2);
 
        if (request_irq(pc110pad_irq, pc110pad_interrupt, 0, "pc110pad", NULL)) {
-               release_region(pc110pad_io, 4);
                printk(KERN_ERR "pc110pad: Unable to get irq %d.\n", pc110pad_irq);
-               return -EBUSY;
+               err = -EBUSY;
+               goto err_release_region;
        }
 
-       if (!(pc110pad_dev = input_allocate_device())) {
-               free_irq(pc110pad_irq, NULL);
-               release_region(pc110pad_io, 4);
+       pc110pad_dev = input_allocate_device();
+       if (!pc110pad_dev) {
                printk(KERN_ERR "pc110pad: Not enough memory.\n");
-               return -ENOMEM;
+               err = -ENOMEM;
+               goto err_free_irq;
        }
 
        pc110pad_dev->name = "IBM PC110 TouchPad";
@@ -143,9 +147,9 @@ static int __init pc110pad_init(void)
        pc110pad_dev->id.product = 0x0001;
        pc110pad_dev->id.version = 0x0100;
 
-       pc110pad_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
-       pc110pad_dev->absbit[0] = BIT(ABS_X) | BIT(ABS_Y);
-       pc110pad_dev->keybit[LONG(BTN_TOUCH)] = BIT(BTN_TOUCH);
+       pc110pad_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_ABS);
+       pc110pad_dev->absbit[0] = BIT_MASK(ABS_X) | BIT_MASK(ABS_Y);
+       pc110pad_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
 
        pc110pad_dev->absmax[ABS_X] = 0x1ff;
        pc110pad_dev->absmax[ABS_Y] = 0x0ff;
@@ -153,9 +157,20 @@ static int __init pc110pad_init(void)
        pc110pad_dev->open = pc110pad_open;
        pc110pad_dev->close = pc110pad_close;
 
-       input_register_device(pc110pad_dev);
+       err = input_register_device(pc110pad_dev);
+       if (err)
+               goto err_free_dev;
 
        return 0;
+
+ err_free_dev:
+       input_free_device(pc110pad_dev);
+ err_free_irq:
+       free_irq(pc110pad_irq, NULL);
+ err_release_region:
+       release_region(pc110pad_io, 4);
+
+       return err;
 }
 
 static void __exit pc110pad_exit(void)