diff mbox

[3/5] Input: tca8418_keypad - move device ID tables closer to where they are used

Message ID 1352911688-5001-3-git-send-email-dmitry.torokhov@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Dmitry Torokhov Nov. 14, 2012, 4:48 p.m. UTC 
This matches structure of most other input drivers.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
 drivers/input/keyboard/tca8418_keypad.c | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

Comments

Alban Bedel Nov. 29, 2012, 1:49 p.m. UTC | #1 
On Wed, 14 Nov 2012 08:48:06 -0800
Dmitry Torokhov <dmitry.torokhov@gmail.com> wrote:

> This matches structure of most other input drivers.
> 
> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

Reviewed-by: Alban Bedel <alban.bedel@avionic-design.de>

> ---
>  drivers/input/keyboard/tca8418_keypad.c | 29 ++++++++++++++---------------
>  1 file changed, 14 insertions(+), 15 deletions(-)
> 
> diff --git a/drivers/input/keyboard/tca8418_keypad.c b/drivers/input/keyboard/tca8418_keypad.c
> index 7f2869f..35340c3 100644
> --- a/drivers/input/keyboard/tca8418_keypad.c
> +++ b/drivers/input/keyboard/tca8418_keypad.c
> @@ -110,21 +110,6 @@
>  #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 __devexit 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,

--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/input/keyboard/tca8418_keypad.c b/drivers/input/keyboard/tca8418_keypad.c
index 7f2869f..35340c3 100644
--- a/drivers/input/keyboard/tca8418_keypad.c
+++ b/drivers/input/keyboard/tca8418_keypad.c
@@ -110,21 +110,6 @@ 
 #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 __devexit 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,