diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-11 00:08:01 +0100 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-11 08:12:46 +0100 |
| commit | d3d25808df236f27ba34125e7cf90de98fbf346c (patch) | |
| tree | 41101bbce35363c62749f547b32001842589800d /drivers/input/keyboard/davinci_keyscan.c | |
| parent | Merge branch 'next' into for-linus (diff) | |
| download | linux-d3d25808df236f27ba34125e7cf90de98fbf346c.tar.xz linux-d3d25808df236f27ba34125e7cf90de98fbf346c.zip | |
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/keyboard/davinci_keyscan.c')
| -rw-r--r-- | drivers/input/keyboard/davinci_keyscan.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/input/keyboard/davinci_keyscan.c b/drivers/input/keyboard/davinci_keyscan.c index 469825247552..9d82b3aeff5e 100644 --- a/drivers/input/keyboard/davinci_keyscan.c +++ b/drivers/input/keyboard/davinci_keyscan.c @@ -328,7 +328,18 @@ static struct platform_driver davinci_ks_driver = { }, .remove = __devexit_p(davinci_ks_remove), }; -module_platform_driver(davinci_ks_driver); + +static int __init davinci_ks_init(void) +{ + return platform_driver_probe(&davinci_ks_driver, davinci_ks_probe); +} +module_init(davinci_ks_init); + +static void __exit davinci_ks_exit(void) +{ + platform_driver_unregister(&davinci_ks_driver); +} +module_exit(davinci_ks_exit); MODULE_AUTHOR("Miguel Aguilar"); MODULE_DESCRIPTION("Texas Instruments DaVinci Key Scan Driver"); |