diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-23 02:27:29 -0500 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-23 03:02:12 -0500 |
commit | db3dbd093a7cbb201f169ace35f6cdff562e5a77 (patch) | |
tree | 2b2d30e3cad8c9d5bb6c3bde120982ef686b5fae /drivers/input | |
parent | dab78d7924598ea4031663dd10db814e2e324928 (diff) |
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>
Diffstat (limited to 'drivers/input')
-rw-r--r-- | drivers/input/keyboard/nomadik-ske-keypad.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/input/keyboard/nomadik-ske-keypad.c b/drivers/input/keyboard/nomadik-ske-keypad.c index 5a71e55c9c54..a804f7b815bb 100644 --- a/drivers/input/keyboard/nomadik-ske-keypad.c +++ b/drivers/input/keyboard/nomadik-ske-keypad.c | |||
@@ -88,7 +88,7 @@ static void ske_keypad_set_bits(struct ske_keypad *keypad, u16 addr, | |||
88 | * | 88 | * |
89 | * Enable Multi key press detection, auto scan mode | 89 | * Enable Multi key press detection, auto scan mode |
90 | */ | 90 | */ |
91 | static int __devinit ske_keypad_chip_init(struct ske_keypad *keypad) | 91 | static int __init ske_keypad_chip_init(struct ske_keypad *keypad) |
92 | { | 92 | { |
93 | u32 value; | 93 | u32 value; |
94 | int timeout = 50; | 94 | int timeout = 50; |
@@ -198,7 +198,7 @@ static irqreturn_t ske_keypad_irq(int irq, void *dev_id) | |||
198 | return IRQ_HANDLED; | 198 | return IRQ_HANDLED; |
199 | } | 199 | } |
200 | 200 | ||
201 | static int __devinit ske_keypad_probe(struct platform_device *pdev) | 201 | static int __init ske_keypad_probe(struct platform_device *pdev) |
202 | { | 202 | { |
203 | const struct ske_keypad_platform_data *plat = pdev->dev.platform_data; | 203 | const struct ske_keypad_platform_data *plat = pdev->dev.platform_data; |
204 | struct ske_keypad *keypad; | 204 | struct ske_keypad *keypad; |
@@ -387,7 +387,6 @@ static struct platform_driver ske_keypad_driver = { | |||
387 | .pm = &ske_keypad_dev_pm_ops, | 387 | .pm = &ske_keypad_dev_pm_ops, |
388 | #endif | 388 | #endif |
389 | }, | 389 | }, |
390 | .probe = ske_keypad_probe, | ||
391 | .remove = __devexit_p(ske_keypad_remove), | 390 | .remove = __devexit_p(ske_keypad_remove), |
392 | }; | 391 | }; |
393 | module_platform_driver(ske_keypad_driver); | 392 | module_platform_driver(ske_keypad_driver); |