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

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

A pointer to omap_wdt_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: Alan Cox <alan@redhat.com>
Cc: Felipe Balbi <felipe.balbi@nokia.com>
Cc: George G. Davis <gdavis@mvista.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent c98d58e0
...@@ -258,7 +258,7 @@ static const struct file_operations omap_wdt_fops = { ...@@ -258,7 +258,7 @@ static const struct file_operations omap_wdt_fops = {
.release = omap_wdt_release, .release = omap_wdt_release,
}; };
static int __init omap_wdt_probe(struct platform_device *pdev) static int __devinit omap_wdt_probe(struct platform_device *pdev)
{ {
struct resource *res, *mem; struct resource *res, *mem;
struct omap_wdt_dev *wdev; struct omap_wdt_dev *wdev;
...@@ -367,7 +367,7 @@ static void omap_wdt_shutdown(struct platform_device *pdev) ...@@ -367,7 +367,7 @@ static void omap_wdt_shutdown(struct platform_device *pdev)
omap_wdt_disable(wdev); omap_wdt_disable(wdev);
} }
static int omap_wdt_remove(struct platform_device *pdev) static int __devexit omap_wdt_remove(struct platform_device *pdev)
{ {
struct omap_wdt_dev *wdev = platform_get_drvdata(pdev); struct omap_wdt_dev *wdev = platform_get_drvdata(pdev);
struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0); struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
...@@ -426,7 +426,7 @@ static int omap_wdt_resume(struct platform_device *pdev) ...@@ -426,7 +426,7 @@ static int omap_wdt_resume(struct platform_device *pdev)
static struct platform_driver omap_wdt_driver = { static struct platform_driver omap_wdt_driver = {
.probe = omap_wdt_probe, .probe = omap_wdt_probe,
.remove = omap_wdt_remove, .remove = __devexit_p(omap_wdt_remove),
.shutdown = omap_wdt_shutdown, .shutdown = omap_wdt_shutdown,
.suspend = omap_wdt_suspend, .suspend = omap_wdt_suspend,
.resume = omap_wdt_resume, .resume = omap_wdt_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