commit db3dbd093a7cbb201f169ace35f6cdff562e5a77
author Dmitry Torokhov <dmitry.torokhov@gmail.com> Sun Jan 22 23:27:29 2012 -0800
committer Dmitry Torokhov <dmitry.torokhov@gmail.com> Mon Jan 23 00:02:12 2012 -0800
tree 2b2d30e3cad8c9d5bb6c3bde120982ef686b5fae
parent dab78d7924598ea4031663dd10db814e2e324928

Input: nomadik-ske-keypad - do not assign driver's probe() method

Because we are using platform_device_probe() to register the driver
we do not need to assign driver's probe method. We also can mark
ske_keypad_probe(), together with ske_keypad_chip_init(), as __init
instead of __devinit.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

drivers/input/keyboard/nomadik-ske-keypad.c

diff --git a/drivers/input/keyboard/nomadik-ske-keypad.c b/drivers/input/keyboard/nomadik-ske-keypad.c
index 5a71e55..a804f7b 100644
--- a/drivers/input/keyboard/nomadik-ske-keypad.c
+++ b/drivers/input/keyboard/nomadik-ske-keypad.c
@@ -88,7 +88,7 @@
  *
  * Enable Multi key press detection, auto scan mode
  */
-static int __devinit ske_keypad_chip_init(struct ske_keypad *keypad)
+static int __init ske_keypad_chip_init(struct ske_keypad *keypad)
 {
 	u32 value;
 	int timeout = 50;
@@ -198,7 +198,7 @@
 	return IRQ_HANDLED;
 }
 
-static int __devinit ske_keypad_probe(struct platform_device *pdev)
+static int __init ske_keypad_probe(struct platform_device *pdev)
 {
 	const struct ske_keypad_platform_data *plat = pdev->dev.platform_data;
 	struct ske_keypad *keypad;
@@ -387,7 +387,6 @@
 		.pm = &ske_keypad_dev_pm_ops,
 #endif
 	},
-	.probe = ske_keypad_probe,
 	.remove = __devexit_p(ske_keypad_remove),
 };
 module_platform_driver(ske_keypad_driver);