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/mtx-1_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/mtx-1_wdt.c')
-rw-r--r-- | drivers/watchdog/mtx-1_wdt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/watchdog/mtx-1_wdt.c b/drivers/watchdog/mtx-1_wdt.c index 539b6f6ba7f1..08e8a6ab74e1 100644 --- a/drivers/watchdog/mtx-1_wdt.c +++ b/drivers/watchdog/mtx-1_wdt.c | |||
@@ -206,7 +206,7 @@ static struct miscdevice mtx1_wdt_misc = { | |||
206 | }; | 206 | }; |
207 | 207 | ||
208 | 208 | ||
209 | static int mtx1_wdt_probe(struct platform_device *pdev) | 209 | static int __devinit mtx1_wdt_probe(struct platform_device *pdev) |
210 | { | 210 | { |
211 | int ret; | 211 | int ret; |
212 | 212 | ||
@@ -229,7 +229,7 @@ static int mtx1_wdt_probe(struct platform_device *pdev) | |||
229 | return 0; | 229 | return 0; |
230 | } | 230 | } |
231 | 231 | ||
232 | static int mtx1_wdt_remove(struct platform_device *pdev) | 232 | static int __devexit mtx1_wdt_remove(struct platform_device *pdev) |
233 | { | 233 | { |
234 | /* FIXME: do we need to lock this test ? */ | 234 | /* FIXME: do we need to lock this test ? */ |
235 | if (mtx1_wdt_device.queue) { | 235 | if (mtx1_wdt_device.queue) { |
@@ -242,7 +242,7 @@ static int mtx1_wdt_remove(struct platform_device *pdev) | |||
242 | 242 | ||
243 | static struct platform_driver mtx1_wdt = { | 243 | static struct platform_driver mtx1_wdt = { |
244 | .probe = mtx1_wdt_probe, | 244 | .probe = mtx1_wdt_probe, |
245 | .remove = mtx1_wdt_remove, | 245 | .remove = __devexit_p(mtx1_wdt_remove), |
246 | .driver.name = "mtx1-wdt", | 246 | .driver.name = "mtx1-wdt", |
247 | .driver.owner = THIS_MODULE, | 247 | .driver.owner = THIS_MODULE, |
248 | }; | 248 | }; |