Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / input / keyboard / omap-keypad.c

diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c
index 6aea1b16b9e864fcc71fbd7f23e7c4a122156db2..0d17854c4881c85cd894b95f274d242f1c85b908 100644 (file)
--- a/drivers/input/keyboard/omap-keypad.c
+++ b/drivers/input/keyboard/omap-keypad.c
@@ -4,7 +4,7 @@
  * OMAP Keypad Driver
  *
  * Copyright (C) 2003 Nokia Corporation
- * Written by Timo Teräs <ext-timo.teras@nokia.com>
+ * Written by Timo Teräs <ext-timo.teras@nokia.com>
  *
  * Added support for H2 & H3 Keypad
  * Copyright (C) 2004 Texas Instruments
@@ -244,7 +244,7 @@ static void omap_kp_tasklet(unsigned long data)
                        omap_writew(0, OMAP_MPUIO_BASE + OMAP_MPUIO_KBD_MASKIT);
                        kp_cur_group = -1;
                }
-       }
+       }
 }
 
 static ssize_t omap_kp_enable_show(struct device *dev,
@@ -345,7 +345,7 @@ static int __init omap_kp_probe(struct platform_device *pdev)
        keymap = pdata->keymap;
 
        if (pdata->rep)
-               set_bit(EV_REP, input_dev->evbit);
+               __set_bit(EV_REP, input_dev->evbit);
 
        if (pdata->delay)
                omap_kp->delay = pdata->delay;
@@ -392,9 +392,9 @@ static int __init omap_kp_probe(struct platform_device *pdev)
                goto err2;
 
        /* setup input device */
-       set_bit(EV_KEY, input_dev->evbit);
+       __set_bit(EV_KEY, input_dev->evbit);
        for (i = 0; keymap[i] != 0; i++)
-               set_bit(keymap[i] & KEY_MAX, input_dev->keybit);
+               __set_bit(keymap[i] & KEY_MAX, input_dev->keybit);
        input_dev->name = "omap-keypad";
        input_dev->phys = "omap-keypad/input0";
        input_dev->dev.parent = &pdev->dev;
@@ -404,10 +404,6 @@ static int __init omap_kp_probe(struct platform_device *pdev)
        input_dev->id.product = 0x0001;
        input_dev->id.version = 0x0100;
 
-       input_dev->keycode = keymap;
-       input_dev->keycodesize = sizeof(unsigned int);
-       input_dev->keycodemax = pdata->keymapsize;
-
        ret = input_register_device(omap_kp->input);
        if (ret < 0) {
                printk(KERN_ERR "Unable to register omap-keypad input device\n");
@@ -430,15 +426,15 @@ static int __init omap_kp_probe(struct platform_device *pdev)
        } else {
                for (irq_idx = 0; irq_idx < omap_kp->rows; irq_idx++) {
                        if (request_irq(OMAP_GPIO_IRQ(row_gpios[irq_idx]),
-                                       omap_kp_interrupt,
+                                       omap_kp_interrupt,
                                        IRQF_TRIGGER_FALLING,
-                                       "omap-keypad", omap_kp) < 0)
+                                       "omap-keypad", omap_kp) < 0)
                                goto err5;
                }
        }
        return 0;
 err5:
-       for (i = irq_idx-1; i >=0; i--)
+       for (i = irq_idx - 1; i >=0; i--)
                free_irq(row_gpios[i], 0);
 err4:
        input_unregister_device(omap_kp->input);
@@ -467,9 +463,9 @@ static int omap_kp_remove(struct platform_device *pdev)
        if (cpu_is_omap24xx()) {
                int i;
                for (i = 0; i < omap_kp->cols; i++)
-                       omap_free_gpio(col_gpios[i]);
+                       omap_free_gpio(col_gpios[i]);
                for (i = 0; i < omap_kp->rows; i++) {
-                       omap_free_gpio(row_gpios[i]);
+                       omap_free_gpio(row_gpios[i]);
                        free_irq(OMAP_GPIO_IRQ(row_gpios[i]), 0);
                }
        } else {
@@ -512,6 +508,6 @@ static void __exit omap_kp_exit(void)
 module_init(omap_kp_init);
 module_exit(omap_kp_exit);
 
-MODULE_AUTHOR("Timo Teräs");
+MODULE_AUTHOR("Timo Teräs");
 MODULE_DESCRIPTION("OMAP Keypad Driver");
 MODULE_LICENSE("GPL");