Commit d3d25808 authored by Dmitry Torokhov's avatar Dmitry Torokhov

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: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent da733563
...@@ -259,6 +259,19 @@ static struct platform_driver amikbd_driver = { ...@@ -259,6 +259,19 @@ static struct platform_driver amikbd_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
}; };
module_platform_driver(amikbd_driver);
static int __init amikbd_init(void)
{
return platform_driver_probe(&amikbd_driver, amikbd_probe);
}
module_init(amikbd_init);
static void __exit amikbd_exit(void)
{
platform_driver_unregister(&amikbd_driver);
}
module_exit(amikbd_exit);
MODULE_ALIAS("platform:amiga-keyboard"); MODULE_ALIAS("platform:amiga-keyboard");
...@@ -328,7 +328,18 @@ static struct platform_driver davinci_ks_driver = { ...@@ -328,7 +328,18 @@ static struct platform_driver davinci_ks_driver = {
}, },
.remove = __devexit_p(davinci_ks_remove), .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_AUTHOR("Miguel Aguilar");
MODULE_DESCRIPTION("Texas Instruments DaVinci Key Scan Driver"); MODULE_DESCRIPTION("Texas Instruments DaVinci Key Scan Driver");
......
...@@ -390,7 +390,18 @@ static struct platform_driver ske_keypad_driver = { ...@@ -390,7 +390,18 @@ static struct platform_driver ske_keypad_driver = {
.probe = ske_keypad_probe, .probe = ske_keypad_probe,
.remove = __devexit_p(ske_keypad_remove), .remove = __devexit_p(ske_keypad_remove),
}; };
module_platform_driver(ske_keypad_driver);
static int __init ske_keypad_init(void)
{
return platform_driver_probe(&ske_keypad_driver, ske_keypad_probe);
}
module_init(ske_keypad_init);
static void __exit ske_keypad_exit(void)
{
platform_driver_unregister(&ske_keypad_driver);
}
module_exit(ske_keypad_exit);
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
MODULE_AUTHOR("Naveen Kumar <naveen.gaddipati@stericsson.com> / Sundar Iyer <sundar.iyer@stericsson.com>"); MODULE_AUTHOR("Naveen Kumar <naveen.gaddipati@stericsson.com> / Sundar Iyer <sundar.iyer@stericsson.com>");
......
...@@ -107,14 +107,25 @@ static int __exit twl4030_pwrbutton_remove(struct platform_device *pdev) ...@@ -107,14 +107,25 @@ static int __exit twl4030_pwrbutton_remove(struct platform_device *pdev)
} }
static struct platform_driver twl4030_pwrbutton_driver = { static struct platform_driver twl4030_pwrbutton_driver = {
.probe = twl4030_pwrbutton_probe,
.remove = __exit_p(twl4030_pwrbutton_remove), .remove = __exit_p(twl4030_pwrbutton_remove),
.driver = { .driver = {
.name = "twl4030_pwrbutton", .name = "twl4030_pwrbutton",
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
}; };
module_platform_driver(twl4030_pwrbutton_driver);
static int __init twl4030_pwrbutton_init(void)
{
return platform_driver_probe(&twl4030_pwrbutton_driver,
twl4030_pwrbutton_probe);
}
module_init(twl4030_pwrbutton_init);
static void __exit twl4030_pwrbutton_exit(void)
{
platform_driver_unregister(&twl4030_pwrbutton_driver);
}
module_exit(twl4030_pwrbutton_exit);
MODULE_ALIAS("platform:twl4030_pwrbutton"); MODULE_ALIAS("platform:twl4030_pwrbutton");
MODULE_DESCRIPTION("Triton2 Power Button"); MODULE_DESCRIPTION("Triton2 Power Button");
......
...@@ -140,13 +140,25 @@ static int __exit amimouse_remove(struct platform_device *pdev) ...@@ -140,13 +140,25 @@ static int __exit amimouse_remove(struct platform_device *pdev)
} }
static struct platform_driver amimouse_driver = { static struct platform_driver amimouse_driver = {
.probe = amimouse_probe,
.remove = __exit_p(amimouse_remove), .remove = __exit_p(amimouse_remove),
.driver = { .driver = {
.name = "amiga-mouse", .name = "amiga-mouse",
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
}; };
module_platform_driver(amimouse_driver);
static int __init amimouse_init(void)
{
return platform_driver_probe(&amimouse_driver, amimouse_probe);
}
module_init(amimouse_init);
static void __exit amimouse_exit(void)
{
platform_driver_unregister(&amimouse_driver);
}
module_exit(amimouse_exit);
MODULE_ALIAS("platform:amiga-mouse"); MODULE_ALIAS("platform:amiga-mouse");
...@@ -358,7 +358,19 @@ static struct platform_driver psif_driver = { ...@@ -358,7 +358,19 @@ static struct platform_driver psif_driver = {
.suspend = psif_suspend, .suspend = psif_suspend,
.resume = psif_resume, .resume = psif_resume,
}; };
module_platform_driver(psif_driver);
static int __init psif_init(void)
{
return platform_driver_probe(&psif_driver, psif_probe);
}
static void __exit psif_exit(void)
{
platform_driver_unregister(&psif_driver);
}
module_init(psif_init);
module_exit(psif_exit);
MODULE_AUTHOR("Hans-Christian Egtvedt <egtvedt@samfundet.no>"); MODULE_AUTHOR("Hans-Christian Egtvedt <egtvedt@samfundet.no>");
MODULE_DESCRIPTION("Atmel AVR32 PSIF PS/2 driver"); MODULE_DESCRIPTION("Atmel AVR32 PSIF PS/2 driver");
......
...@@ -429,7 +429,18 @@ static struct platform_driver atmel_wm97xx_driver = { ...@@ -429,7 +429,18 @@ static struct platform_driver atmel_wm97xx_driver = {
.suspend = atmel_wm97xx_suspend, .suspend = atmel_wm97xx_suspend,
.resume = atmel_wm97xx_resume, .resume = atmel_wm97xx_resume,
}; };
module_platform_driver(atmel_wm97xx_driver);
static int __init atmel_wm97xx_init(void)
{
return platform_driver_probe(&atmel_wm97xx_driver, atmel_wm97xx_probe);
}
module_init(atmel_wm97xx_init);
static void __exit atmel_wm97xx_exit(void)
{
platform_driver_unregister(&atmel_wm97xx_driver);
}
module_exit(atmel_wm97xx_exit);
MODULE_AUTHOR("Hans-Christian Egtvedt <egtvedt@samfundet.no>"); MODULE_AUTHOR("Hans-Christian Egtvedt <egtvedt@samfundet.no>");
MODULE_DESCRIPTION("wm97xx continuous touch driver for Atmel AT91 and AVR32"); MODULE_DESCRIPTION("wm97xx continuous touch driver for Atmel AT91 and AVR32");
......
...@@ -240,7 +240,18 @@ static struct platform_driver mc13783_ts_driver = { ...@@ -240,7 +240,18 @@ static struct platform_driver mc13783_ts_driver = {
.name = MC13783_TS_NAME, .name = MC13783_TS_NAME,
}, },
}; };
module_platform_driver(mc13783_ts_driver);
static int __init mc13783_ts_init(void)
{
return platform_driver_probe(&mc13783_ts_driver, &mc13783_ts_probe);
}
module_init(mc13783_ts_init);
static void __exit mc13783_ts_exit(void)
{
platform_driver_unregister(&mc13783_ts_driver);
}
module_exit(mc13783_ts_exit);
MODULE_DESCRIPTION("MC13783 input touchscreen driver"); MODULE_DESCRIPTION("MC13783 input touchscreen driver");
MODULE_AUTHOR("Sascha Hauer <s.hauer@pengutronix.de>"); MODULE_AUTHOR("Sascha Hauer <s.hauer@pengutronix.de>");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment