Skip to content

Commit

Permalink
[WATCHDOG] ks8695_wdt.c: move probe function to .devinit.text
Browse files Browse the repository at this point in the history
A pointer to ks8695wdt_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: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Alan Cox <alan@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
  • Loading branch information
Uwe Kleine-König authored and Wim Van Sebroeck committed Apr 8, 2009
1 parent 47dec7c commit c98d58e
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/watchdog/ks8695_wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ static struct miscdevice ks8695wdt_miscdev = {
.fops = &ks8695wdt_fops,
};

static int __init ks8695wdt_probe(struct platform_device *pdev)
static int __devinit ks8695wdt_probe(struct platform_device *pdev)
{
int res;

Expand All @@ -238,7 +238,7 @@ static int __init ks8695wdt_probe(struct platform_device *pdev)
return 0;
}

static int __exit ks8695wdt_remove(struct platform_device *pdev)
static int __devexit ks8695wdt_remove(struct platform_device *pdev)
{
int res;

Expand Down Expand Up @@ -276,7 +276,7 @@ static int ks8695wdt_resume(struct platform_device *pdev)

static struct platform_driver ks8695wdt_driver = {
.probe = ks8695wdt_probe,
.remove = __exit_p(ks8695wdt_remove),
.remove = __devexit_p(ks8695wdt_remove),
.shutdown = ks8695wdt_shutdown,
.suspend = ks8695wdt_suspend,
.resume = ks8695wdt_resume,
Expand Down

0 comments on commit c98d58e

Please sign in to comment.