From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: Alban Bedel <alban.bedel@avionic-design.de>
Cc: linux-input@vger.kernel.org
Subject: [PATCH 3/5] Input: tca8418_keypad - move device ID tables closer to where they are used
Date: Wed, 14 Nov 2012 08:48:06 -0800 [thread overview]
Message-ID: <1352911688-5001-3-git-send-email-dmitry.torokhov@gmail.com> (raw)
In-Reply-To: <1352911688-5001-1-git-send-email-dmitry.torokhov@gmail.com>
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(-)
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,
--
1.7.11.7
next prev parent reply other threads:[~2012-11-14 16:48 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-14 16:48 [PATCH 1/5] Input: tca8418_keypad - use a temporary variable for parent device Dmitry Torokhov
2012-11-14 16:48 ` [PATCH 2/5] Input: tca8418_keypad - use dev_get_platdata() to retrieve platform data Dmitry Torokhov
2012-11-29 13:48 ` Alban Bedel
2012-11-14 16:48 ` Dmitry Torokhov [this message]
2012-11-29 13:49 ` [PATCH 3/5] Input: tca8418_keypad - move device ID tables closer to where they are used Alban Bedel
2012-11-14 16:48 ` [PATCH 4/5] Input: tca8418_keypad - increase severity of failures in probe() Dmitry Torokhov
2012-11-29 13:49 ` Alban Bedel
2012-11-14 16:48 ` [PATCH 5/5] Input: tca8418-keypad - switch to use managed resources Dmitry Torokhov
2012-11-29 13:51 ` Alban Bedel
2012-11-21 7:04 ` [PATCH 1/5] Input: tca8418_keypad - use a temporary variable for parent device Dmitry Torokhov
2012-11-29 13:47 ` Alban Bedel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1352911688-5001-3-git-send-email-dmitry.torokhov@gmail.com \
--to=dmitry.torokhov@gmail.com \
--cc=alban.bedel@avionic-design.de \
--cc=linux-input@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).