openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Dmitry Torokhov 2012-01-22 23:27:29 -08:00
parent dab78d7924
commit db3dbd093a
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/input/keyboard/nomadik-ske-keypad.c
View File

@ -88,7 +88,7 @@ static void ske_keypad_set_bits(struct ske_keypad *keypad, u16 addr,
* *
* Enable Multi key press detection, auto scan mode * 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; u32 value;
int timeout = 50; int timeout = 50;
@ -198,7 +198,7 @@ static irqreturn_t ske_keypad_irq(int irq, void *dev_id)
return IRQ_HANDLED; 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; const struct ske_keypad_platform_data *plat = pdev->dev.platform_data;
struct ske_keypad *keypad; struct ske_keypad *keypad;
@ -387,7 +387,6 @@ static struct platform_driver ske_keypad_driver = {
.pm = &ske_keypad_dev_pm_ops, .pm = &ske_keypad_dev_pm_ops,
#endif #endif
}, },
.probe = ske_keypad_probe,
.remove = __devexit_p(ske_keypad_remove), .remove = __devexit_p(ske_keypad_remove),
}; };
module_platform_driver(ske_keypad_driver); module_platform_driver(ske_keypad_driver);