Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+2 -3
+2 -3
drivers/input/keyboard/nomadik-ske-keypad.c
··· 88 88 * 89 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 93 u32 value; 94 94 int timeout = 50; ··· 198 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 203 const struct ske_keypad_platform_data *plat = pdev->dev.platform_data; 204 204 struct ske_keypad *keypad; ··· 387 387 .pm = &ske_keypad_dev_pm_ops, 388 388 #endif 389 389 }, 390 - .probe = ske_keypad_probe, 391 390 .remove = __devexit_p(ske_keypad_remove), 392 391 }; 393 392 module_platform_driver(ske_keypad_driver);