diff options
author | Wim Van Sebroeck <wim@iguana.be> | 2009-04-14 16:30:55 -0400 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2009-06-18 03:30:44 -0400 |
commit | b6bf291f1c5bc84272a138b7367741e459005a81 (patch) | |
tree | 1989891cd0eefe7143f3809ca36627fe61fb759c /drivers/watchdog/rdc321x_wdt.c | |
parent | a77dba7e444a6618cbb666d1b42b79842b9c0171 (diff) |
[WATCHDOG] move platform probe and remove function to devinit and devexit
A pointer to probe and remove functions 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.
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog/rdc321x_wdt.c')
-rw-r--r-- | drivers/watchdog/rdc321x_wdt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/watchdog/rdc321x_wdt.c b/drivers/watchdog/rdc321x_wdt.c index 36e221beedcd..4976bfd1fce6 100644 --- a/drivers/watchdog/rdc321x_wdt.c +++ b/drivers/watchdog/rdc321x_wdt.c | |||
@@ -245,7 +245,7 @@ static int __devinit rdc321x_wdt_probe(struct platform_device *pdev) | |||
245 | return 0; | 245 | return 0; |
246 | } | 246 | } |
247 | 247 | ||
248 | static int rdc321x_wdt_remove(struct platform_device *pdev) | 248 | static int __devexit rdc321x_wdt_remove(struct platform_device *pdev) |
249 | { | 249 | { |
250 | if (rdc321x_wdt_device.queue) { | 250 | if (rdc321x_wdt_device.queue) { |
251 | rdc321x_wdt_device.queue = 0; | 251 | rdc321x_wdt_device.queue = 0; |
@@ -259,7 +259,7 @@ static int rdc321x_wdt_remove(struct platform_device *pdev) | |||
259 | 259 | ||
260 | static struct platform_driver rdc321x_wdt_driver = { | 260 | static struct platform_driver rdc321x_wdt_driver = { |
261 | .probe = rdc321x_wdt_probe, | 261 | .probe = rdc321x_wdt_probe, |
262 | .remove = rdc321x_wdt_remove, | 262 | .remove = __devexit_p(rdc321x_wdt_remove), |
263 | .driver = { | 263 | .driver = { |
264 | .owner = THIS_MODULE, | 264 | .owner = THIS_MODULE, |
265 | .name = "rdc321x-wdt", | 265 | .name = "rdc321x-wdt", |