aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/serio/at32psif.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2012-01-10 18:08:01 -0500
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-01-11 02:12:46 -0500
commitd3d25808df236f27ba34125e7cf90de98fbf346c (patch)
tree41101bbce35363c62749f547b32001842589800d /drivers/input/serio/at32psif.c
parentda733563be5a9da26fe81d9f007262d00b846e22 (diff)
Input: revert some over-zealous conversions to module_platform_driver()
Recent conversion to module_platform_driver() went a bit too far and converted not only drivers that used platform_driver_register() but also ones using platform_driver_probe(), breaking them in process. Reported-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/serio/at32psif.c')
-rw-r--r--drivers/input/serio/at32psif.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/drivers/input/serio/at32psif.c b/drivers/input/serio/at32psif.c
index 421a7442e464..95280f9207e1 100644
--- a/drivers/input/serio/at32psif.c
+++ b/drivers/input/serio/at32psif.c
@@ -358,7 +358,19 @@ static struct platform_driver psif_driver = {
358 .suspend = psif_suspend, 358 .suspend = psif_suspend,
359 .resume = psif_resume, 359 .resume = psif_resume,
360}; 360};
361module_platform_driver(psif_driver); 361
362static int __init psif_init(void)
363{
364 return platform_driver_probe(&psif_driver, psif_probe);
365}
366
367static void __exit psif_exit(void)
368{
369 platform_driver_unregister(&psif_driver);
370}
371
372module_init(psif_init);
373module_exit(psif_exit);
362 374
363MODULE_AUTHOR("Hans-Christian Egtvedt <egtvedt@samfundet.no>"); 375MODULE_AUTHOR("Hans-Christian Egtvedt <egtvedt@samfundet.no>");
364MODULE_DESCRIPTION("Atmel AVR32 PSIF PS/2 driver"); 376MODULE_DESCRIPTION("Atmel AVR32 PSIF PS/2 driver");