Skip to content

Commit

Permalink
Input: corgi_ts - mark probe function as __devinit
Browse files Browse the repository at this point in the history
A pointer to corgits_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>
  • Loading branch information
Uwe Kleine-König authored and Dmitry Torokhov committed Jan 13, 2009
1 parent f2d8dc7 commit 840207e
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions drivers/input/touchscreen/corgi_ts.c
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ static int corgits_resume(struct platform_device *dev)
#define corgits_resume NULL
#endif

static int __init corgits_probe(struct platform_device *pdev)
static int __devinit corgits_probe(struct platform_device *pdev)
{
struct corgi_ts *corgi_ts;
struct input_dev *input_dev;
Expand Down Expand Up @@ -343,7 +343,7 @@ static int __init corgits_probe(struct platform_device *pdev)
return err;
}

static int corgits_remove(struct platform_device *pdev)
static int __devexit corgits_remove(struct platform_device *pdev)
{
struct corgi_ts *corgi_ts = platform_get_drvdata(pdev);

Expand All @@ -352,12 +352,13 @@ static int corgits_remove(struct platform_device *pdev)
corgi_ts->machinfo->put_hsync();
input_unregister_device(corgi_ts->input);
kfree(corgi_ts);

return 0;
}

static struct platform_driver corgits_driver = {
.probe = corgits_probe,
.remove = corgits_remove,
.remove = __devexit_p(corgits_remove),
.suspend = corgits_suspend,
.resume = corgits_resume,
.driver = {
Expand All @@ -366,7 +367,7 @@ static struct platform_driver corgits_driver = {
},
};

static int __devinit corgits_init(void)
static int __init corgits_init(void)
{
return platform_driver_register(&corgits_driver);
}
Expand Down

0 comments on commit 840207e

Please sign in to comment.