Input: tca8418_keypad - move device ID tables closer to where they are used
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 14 Nov 2012 16:16:15 +0000 (08:16 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 29 Nov 2012 17:30:22 +0000 (09:30 -0800)
This matches structure of most other input drivers.

Reviewed-by: Alban Bedel <alban.bedel@avionic-design.de>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/keyboard/tca8418_keypad.c

index ab41a2ea30557e37e213ed0e7d012332e5ca0031..9084327efb3ad07507c3dc28c265fe6fed0d997f 100644 (file)
 #define KEY_EVENT_CODE         0x7f
 #define KEY_EVENT_VALUE                0x80
 
-
-static const struct i2c_device_id tca8418_id[] = {
-       { TCA8418_NAME, 8418, },
-       { }
-};
-MODULE_DEVICE_TABLE(i2c, tca8418_id);
-
-#ifdef CONFIG_OF
-static const struct of_device_id tca8418_dt_ids[] __devinitconst = {
-       { .compatible = "ti,tca8418", },
-       { }
-};
-MODULE_DEVICE_TABLE(of, tca8418_dt_ids);
-#endif
-
 struct tca8418_keypad {
        unsigned int irq;
        unsigned int row_shift;
@@ -419,6 +404,20 @@ static int tca8418_keypad_remove(struct i2c_client *client)
        return 0;
 }
 
+static const struct i2c_device_id tca8418_id[] = {
+       { TCA8418_NAME, 8418, },
+       { }
+};
+MODULE_DEVICE_TABLE(i2c, tca8418_id);
+
+#ifdef CONFIG_OF
+static const struct of_device_id tca8418_dt_ids[] __devinitconst = {
+       { .compatible = "ti,tca8418", },
+       { }
+};
+MODULE_DEVICE_TABLE(of, tca8418_dt_ids);
+#endif
+
 static struct i2c_driver tca8418_keypad_driver = {
        .driver = {
                .name   = TCA8418_NAME,