Commit 47dec7c6 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Wim Van Sebroeck

[WATCHDOG] at91rm9200_wdt.c: move probe function to .devinit.text

A pointer to at91wdt_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.
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Andrew Victor <linux@maxim.org.za>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Ilpo Jarvinen <ilpo.jarvinen@helsinki.fi>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent b8f75b0d
...@@ -197,7 +197,7 @@ static struct miscdevice at91wdt_miscdev = { ...@@ -197,7 +197,7 @@ static struct miscdevice at91wdt_miscdev = {
.fops = &at91wdt_fops, .fops = &at91wdt_fops,
}; };
static int __init at91wdt_probe(struct platform_device *pdev) static int __devinit at91wdt_probe(struct platform_device *pdev)
{ {
int res; int res;
...@@ -214,7 +214,7 @@ static int __init at91wdt_probe(struct platform_device *pdev) ...@@ -214,7 +214,7 @@ static int __init at91wdt_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int __exit at91wdt_remove(struct platform_device *pdev) static int __devexit at91wdt_remove(struct platform_device *pdev)
{ {
int res; int res;
...@@ -252,7 +252,7 @@ static int at91wdt_resume(struct platform_device *pdev) ...@@ -252,7 +252,7 @@ static int at91wdt_resume(struct platform_device *pdev)
static struct platform_driver at91wdt_driver = { static struct platform_driver at91wdt_driver = {
.probe = at91wdt_probe, .probe = at91wdt_probe,
.remove = __exit_p(at91wdt_remove), .remove = __devexit_p(at91wdt_remove),
.shutdown = at91wdt_shutdown, .shutdown = at91wdt_shutdown,
.suspend = at91wdt_suspend, .suspend = at91wdt_suspend,
.resume = at91wdt_resume, .resume = at91wdt_resume,
......
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