Commit d63dab00 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Dmitry Torokhov

Input: omap-keypad - mark probe function as __devinit

A pointer to omap_kp_probe is passed to the core via
platform_driver_register and so the function must not disappear when the
.init sections are discarded.  Otherwise (if also having HOTPLUG=y)
unbinding and binding a device to the driver via sysfs will result in an
oops as does a device being registered late.

An alternative to this patch is using platform_driver_probe instead of
platform_driver_register plus removing the pointer to the probe function
from the struct platform_driver.

[dtor@mail.ru: fixed some more section markups]
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 840207ed
...@@ -279,7 +279,7 @@ static int omap_kp_resume(struct platform_device *dev) ...@@ -279,7 +279,7 @@ static int omap_kp_resume(struct platform_device *dev)
#define omap_kp_resume NULL #define omap_kp_resume NULL
#endif #endif
static int __init omap_kp_probe(struct platform_device *pdev) static int __devinit omap_kp_probe(struct platform_device *pdev)
{ {
struct omap_kp *omap_kp; struct omap_kp *omap_kp;
struct input_dev *input_dev; struct input_dev *input_dev;
...@@ -422,7 +422,7 @@ static int __init omap_kp_probe(struct platform_device *pdev) ...@@ -422,7 +422,7 @@ static int __init omap_kp_probe(struct platform_device *pdev)
return -EINVAL; return -EINVAL;
} }
static int omap_kp_remove(struct platform_device *pdev) static int __devexit omap_kp_remove(struct platform_device *pdev)
{ {
struct omap_kp *omap_kp = platform_get_drvdata(pdev); struct omap_kp *omap_kp = platform_get_drvdata(pdev);
...@@ -454,7 +454,7 @@ static int omap_kp_remove(struct platform_device *pdev) ...@@ -454,7 +454,7 @@ static int omap_kp_remove(struct platform_device *pdev)
static struct platform_driver omap_kp_driver = { static struct platform_driver omap_kp_driver = {
.probe = omap_kp_probe, .probe = omap_kp_probe,
.remove = omap_kp_remove, .remove = __devexit_p(omap_kp_remove),
.suspend = omap_kp_suspend, .suspend = omap_kp_suspend,
.resume = omap_kp_resume, .resume = omap_kp_resume,
.driver = { .driver = {
...@@ -463,7 +463,7 @@ static struct platform_driver omap_kp_driver = { ...@@ -463,7 +463,7 @@ static struct platform_driver omap_kp_driver = {
}, },
}; };
static int __devinit omap_kp_init(void) static int __init omap_kp_init(void)
{ {
printk(KERN_INFO "OMAP Keypad Driver\n"); printk(KERN_INFO "OMAP Keypad Driver\n");
return platform_driver_register(&omap_kp_driver); return platform_driver_register(&omap_kp_driver);
......
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