Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[sfrench/cifs-2.6.git] / drivers / input / keyboard / locomokbd.c

diff --git a/drivers/input/keyboard/locomokbd.c b/drivers/input/keyboard/locomokbd.c
index fd33c9cc3272ac78972e31dd566c193564e0681f..5a0ca18d6755827b77d776af407364b1a8b2d30d 100644 (file)
--- a/drivers/input/keyboard/locomokbd.c
+++ b/drivers/input/keyboard/locomokbd.c
@@ -186,29 +186,29 @@ static irqreturn_t locomokbd_interrupt(int irq, void *dev_id)
 static void locomokbd_timer_callback(unsigned long data)
 {
        struct locomokbd *locomokbd = (struct locomokbd *) data;
-       locomokbd_scankeyboard(locomokbd, NULL);
+       locomokbd_scankeyboard(locomokbd);
 }
 
 static int locomokbd_probe(struct locomo_dev *dev)
 {
        struct locomokbd *locomokbd;
        struct input_dev *input_dev;
-       int i, ret;
+       int i, err;
 
        locomokbd = kzalloc(sizeof(struct locomokbd), GFP_KERNEL);
        input_dev = input_allocate_device();
        if (!locomokbd || !input_dev) {
-               ret = -ENOMEM;
-               goto free;
+               err = -ENOMEM;
+               goto err_free_mem;
        }
 
        /* try and claim memory region */
        if (!request_mem_region((unsigned long) dev->mapbase,
                                dev->length,
                                LOCOMO_DRIVER_NAME(dev))) {
-               ret = -EBUSY;
+               err = -EBUSY;
                printk(KERN_ERR "locomokbd: Can't acquire access to io memory for keyboard\n");
-               goto free;
+               goto err_free_mem;
        }
 
        locomokbd->ldev = dev;
@@ -231,9 +231,9 @@ static int locomokbd_probe(struct locomo_dev *dev)
        input_dev->id.vendor = 0x0001;
        input_dev->id.product = 0x0001;
        input_dev->id.version = 0x0100;
-       input_dev->private = locomokbd;
+       input_dev->dev.parent = &dev->dev;
 
-       input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
+       input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REP);
        input_dev->keycode = locomokbd->keycode;
        input_dev->keycodesize = sizeof(unsigned char);
        input_dev->keycodemax = ARRAY_SIZE(locomokbd_keycode);
@@ -244,24 +244,28 @@ static int locomokbd_probe(struct locomo_dev *dev)
        clear_bit(0, input_dev->keybit);
 
        /* attempt to get the interrupt */
-       ret = request_irq(dev->irq[0], locomokbd_interrupt, 0, "locomokbd", locomokbd);
-       if (ret) {
+       err = request_irq(dev->irq[0], locomokbd_interrupt, 0, "locomokbd", locomokbd);
+       if (err) {
                printk(KERN_ERR "locomokbd: Can't get irq for keyboard\n");
-               goto out;
+               goto err_release_region;
        }
 
-       input_register_device(locomokbd->input);
+       err = input_register_device(locomokbd->input);
+       if (err)
+               goto err_free_irq;
 
        return 0;
 
-out:
+ err_free_irq:
+       free_irq(dev->irq[0], locomokbd);
+ err_release_region:
        release_mem_region((unsigned long) dev->mapbase, dev->length);
        locomo_set_drvdata(dev, NULL);
-free:
+ err_free_mem:
        input_free_device(input_dev);
        kfree(locomokbd);
 
-       return ret;
+       return err;
 }
 
 static int locomokbd_remove(struct locomo_dev *dev)