diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-10 18:08:01 -0500 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-11 02:12:46 -0500 |
commit | d3d25808df236f27ba34125e7cf90de98fbf346c (patch) | |
tree | 41101bbce35363c62749f547b32001842589800d /drivers/input/touchscreen/mc13783_ts.c | |
parent | da733563be5a9da26fe81d9f007262d00b846e22 (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/touchscreen/mc13783_ts.c')
-rw-r--r-- | drivers/input/touchscreen/mc13783_ts.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/mc13783_ts.c b/drivers/input/touchscreen/mc13783_ts.c index 68f86f7dabbc..ede02743eac1 100644 --- a/drivers/input/touchscreen/mc13783_ts.c +++ b/drivers/input/touchscreen/mc13783_ts.c | |||
@@ -240,7 +240,18 @@ static struct platform_driver mc13783_ts_driver = { | |||
240 | .name = MC13783_TS_NAME, | 240 | .name = MC13783_TS_NAME, |
241 | }, | 241 | }, |
242 | }; | 242 | }; |
243 | module_platform_driver(mc13783_ts_driver); | 243 | |
244 | static int __init mc13783_ts_init(void) | ||
245 | { | ||
246 | return platform_driver_probe(&mc13783_ts_driver, &mc13783_ts_probe); | ||
247 | } | ||
248 | module_init(mc13783_ts_init); | ||
249 | |||
250 | static void __exit mc13783_ts_exit(void) | ||
251 | { | ||
252 | platform_driver_unregister(&mc13783_ts_driver); | ||
253 | } | ||
254 | module_exit(mc13783_ts_exit); | ||
244 | 255 | ||
245 | MODULE_DESCRIPTION("MC13783 input touchscreen driver"); | 256 | MODULE_DESCRIPTION("MC13783 input touchscreen driver"); |
246 | MODULE_AUTHOR("Sascha Hauer <s.hauer@pengutronix.de>"); | 257 | MODULE_AUTHOR("Sascha Hauer <s.hauer@pengutronix.de>"); |