renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-18 10:34:24 +08:00
Code

Input: corgikbd - mark probe function as __devinit

Browse Source 
A pointer to corgikbd_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: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Uwe Kleine-König 2009-01-12 22:29:23 -08:00 committed by Dmitry Torokhov
parent 74ca11c205
commit f2d8dc75a1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/input/keyboard/corgikbd.c
View File

@ -288,7 +288,7 @@ static int corgikbd_resume(struct platform_device *dev)
#define corgikbd_resume NULL #define corgikbd_resume NULL
#endif #endif
static int __init corgikbd_probe(struct platform_device *pdev) static int __devinit corgikbd_probe(struct platform_device *pdev)
{ {
struct corgikbd *corgikbd; struct corgikbd *corgikbd;
struct input_dev *input_dev; struct input_dev *input_dev;
@ -368,7 +368,7 @@ static int __init corgikbd_probe(struct platform_device *pdev)
return err; return err;
} }
static int corgikbd_remove(struct platform_device *pdev) static int __devexit corgikbd_remove(struct platform_device *pdev)
{ {
int i; int i;
struct corgikbd *corgikbd = platform_get_drvdata(pdev); struct corgikbd *corgikbd = platform_get_drvdata(pdev);
@ -388,7 +388,7 @@ static int corgikbd_remove(struct platform_device *pdev)
static struct platform_driver corgikbd_driver = { static struct platform_driver corgikbd_driver = {
.probe = corgikbd_probe, .probe = corgikbd_probe,
.remove = corgikbd_remove, .remove = __devexit_p(corgikbd_remove),
.suspend = corgikbd_suspend, .suspend = corgikbd_suspend,
.resume = corgikbd_resume, .resume = corgikbd_resume,
.driver = { .driver = {
@ -397,7 +397,7 @@ static struct platform_driver corgikbd_driver = {
}, },
}; };
static int __devinit corgikbd_init(void) static int __init corgikbd_init(void)
{ {
return platform_driver_register(&corgikbd_driver); return platform_driver_register(&corgikbd_driver);
} }