Commit 82268714bdf06bc06135efb707a9de590ab2d294
Committed by
Greg Kroah-Hartman
1 parent
f90f54b3f3
Exists in
smarc-l5.0.0_1.0.0-ga
and in
5 other branches
watchdog: remove use of __devexit_p
CONFIG_HOTPLUG is going away as an option so __devexit_p is no longer needed. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Cc: Wim Van Sebroeck <wim@iguana.be> Cc: Wan ZongShun <mcuos.com@gmail.com> Cc: Ben Dooks <ben-linux@fluff.org> Cc: Kukjin Kim <kgene.kim@samsung.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Showing 50 changed files with 50 additions and 50 deletions Side-by-side Diff
- drivers/watchdog/acquirewdt.c
- drivers/watchdog/advantechwdt.c
- drivers/watchdog/ar7_wdt.c
- drivers/watchdog/at91rm9200_wdt.c
- drivers/watchdog/ath79_wdt.c
- drivers/watchdog/bcm63xx_wdt.c
- drivers/watchdog/bfin_wdt.c
- drivers/watchdog/cpwd.c
- drivers/watchdog/da9052_wdt.c
- drivers/watchdog/davinci_wdt.c
- drivers/watchdog/dw_wdt.c
- drivers/watchdog/ep93xx_wdt.c
- drivers/watchdog/geodewdt.c
- drivers/watchdog/hpwdt.c
- drivers/watchdog/i6300esb.c
- drivers/watchdog/iTCO_wdt.c
- drivers/watchdog/ib700wdt.c
- drivers/watchdog/ie6xx_wdt.c
- drivers/watchdog/jz4740_wdt.c
- drivers/watchdog/ks8695_wdt.c
- drivers/watchdog/lantiq_wdt.c
- drivers/watchdog/max63xx_wdt.c
- drivers/watchdog/mpc8xxx_wdt.c
- drivers/watchdog/mpcore_wdt.c
- drivers/watchdog/mtx-1_wdt.c
- drivers/watchdog/mv64x60_wdt.c
- drivers/watchdog/nuc900_wdt.c
- drivers/watchdog/nv_tco.c
- drivers/watchdog/of_xilinx_wdt.c
- drivers/watchdog/omap_wdt.c
- drivers/watchdog/orion_wdt.c
- drivers/watchdog/pcwd.c
- drivers/watchdog/pcwd_pci.c
- drivers/watchdog/pnx4008_wdt.c
- drivers/watchdog/rc32434_wdt.c
- drivers/watchdog/rdc321x_wdt.c
- drivers/watchdog/riowd.c
- drivers/watchdog/s3c2410_wdt.c
- drivers/watchdog/sch311x_wdt.c
- drivers/watchdog/shwdt.c
- drivers/watchdog/sp5100_tco.c
- drivers/watchdog/sp805_wdt.c
- drivers/watchdog/stmp3xxx_wdt.c
- drivers/watchdog/ts72xx_wdt.c
- drivers/watchdog/twl4030_wdt.c
- drivers/watchdog/via_wdt.c
- drivers/watchdog/wdt_pci.c
- drivers/watchdog/wm831x_wdt.c
- drivers/watchdog/wm8350_wdt.c
- drivers/watchdog/xen_wdt.c
drivers/watchdog/acquirewdt.c
drivers/watchdog/advantechwdt.c
drivers/watchdog/ar7_wdt.c
drivers/watchdog/at91rm9200_wdt.c
... | ... | @@ -254,7 +254,7 @@ |
254 | 254 | |
255 | 255 | static struct platform_driver at91wdt_driver = { |
256 | 256 | .probe = at91wdt_probe, |
257 | - .remove = __devexit_p(at91wdt_remove), | |
257 | + .remove = at91wdt_remove, | |
258 | 258 | .shutdown = at91wdt_shutdown, |
259 | 259 | .suspend = at91wdt_suspend, |
260 | 260 | .resume = at91wdt_resume, |
drivers/watchdog/ath79_wdt.c
drivers/watchdog/bcm63xx_wdt.c
... | ... | @@ -304,7 +304,7 @@ |
304 | 304 | |
305 | 305 | static struct platform_driver bcm63xx_wdt_driver = { |
306 | 306 | .probe = bcm63xx_wdt_probe, |
307 | - .remove = __devexit_p(bcm63xx_wdt_remove), | |
307 | + .remove = bcm63xx_wdt_remove, | |
308 | 308 | .shutdown = bcm63xx_wdt_shutdown, |
309 | 309 | .driver = { |
310 | 310 | .owner = THIS_MODULE, |
drivers/watchdog/bfin_wdt.c
... | ... | @@ -401,7 +401,7 @@ |
401 | 401 | |
402 | 402 | static struct platform_driver bfin_wdt_driver = { |
403 | 403 | .probe = bfin_wdt_probe, |
404 | - .remove = __devexit_p(bfin_wdt_remove), | |
404 | + .remove = bfin_wdt_remove, | |
405 | 405 | .shutdown = bfin_wdt_shutdown, |
406 | 406 | .suspend = bfin_wdt_suspend, |
407 | 407 | .resume = bfin_wdt_resume, |
drivers/watchdog/cpwd.c
drivers/watchdog/da9052_wdt.c
drivers/watchdog/davinci_wdt.c
drivers/watchdog/dw_wdt.c
drivers/watchdog/ep93xx_wdt.c
drivers/watchdog/geodewdt.c
drivers/watchdog/hpwdt.c
drivers/watchdog/i6300esb.c
drivers/watchdog/iTCO_wdt.c
drivers/watchdog/ib700wdt.c
drivers/watchdog/ie6xx_wdt.c
drivers/watchdog/jz4740_wdt.c
drivers/watchdog/ks8695_wdt.c
... | ... | @@ -290,7 +290,7 @@ |
290 | 290 | |
291 | 291 | static struct platform_driver ks8695wdt_driver = { |
292 | 292 | .probe = ks8695wdt_probe, |
293 | - .remove = __devexit_p(ks8695wdt_remove), | |
293 | + .remove = ks8695wdt_remove, | |
294 | 294 | .shutdown = ks8695wdt_shutdown, |
295 | 295 | .suspend = ks8695wdt_suspend, |
296 | 296 | .resume = ks8695wdt_resume, |
drivers/watchdog/lantiq_wdt.c
drivers/watchdog/max63xx_wdt.c
... | ... | @@ -228,7 +228,7 @@ |
228 | 228 | |
229 | 229 | static struct platform_driver max63xx_wdt_driver = { |
230 | 230 | .probe = max63xx_wdt_probe, |
231 | - .remove = __devexit_p(max63xx_wdt_remove), | |
231 | + .remove = max63xx_wdt_remove, | |
232 | 232 | .id_table = max63xx_id_table, |
233 | 233 | .driver = { |
234 | 234 | .name = "max63xx_wdt", |
drivers/watchdog/mpc8xxx_wdt.c
drivers/watchdog/mpcore_wdt.c
... | ... | @@ -415,7 +415,7 @@ |
415 | 415 | |
416 | 416 | static struct platform_driver mpcore_wdt_driver = { |
417 | 417 | .probe = mpcore_wdt_probe, |
418 | - .remove = __devexit_p(mpcore_wdt_remove), | |
418 | + .remove = mpcore_wdt_remove, | |
419 | 419 | .suspend = mpcore_wdt_suspend, |
420 | 420 | .resume = mpcore_wdt_resume, |
421 | 421 | .shutdown = mpcore_wdt_shutdown, |
drivers/watchdog/mtx-1_wdt.c
drivers/watchdog/mv64x60_wdt.c
... | ... | @@ -300,7 +300,7 @@ |
300 | 300 | |
301 | 301 | static struct platform_driver mv64x60_wdt_driver = { |
302 | 302 | .probe = mv64x60_wdt_probe, |
303 | - .remove = __devexit_p(mv64x60_wdt_remove), | |
303 | + .remove = mv64x60_wdt_remove, | |
304 | 304 | .driver = { |
305 | 305 | .owner = THIS_MODULE, |
306 | 306 | .name = MV64x60_WDT_NAME, |
drivers/watchdog/nuc900_wdt.c
drivers/watchdog/nv_tco.c
drivers/watchdog/of_xilinx_wdt.c
drivers/watchdog/omap_wdt.c
... | ... | @@ -426,7 +426,7 @@ |
426 | 426 | |
427 | 427 | static struct platform_driver omap_wdt_driver = { |
428 | 428 | .probe = omap_wdt_probe, |
429 | - .remove = __devexit_p(omap_wdt_remove), | |
429 | + .remove = omap_wdt_remove, | |
430 | 430 | .shutdown = omap_wdt_shutdown, |
431 | 431 | .suspend = omap_wdt_suspend, |
432 | 432 | .resume = omap_wdt_resume, |
drivers/watchdog/orion_wdt.c
drivers/watchdog/pcwd.c
... | ... | @@ -984,7 +984,7 @@ |
984 | 984 | static struct isa_driver pcwd_isa_driver = { |
985 | 985 | .match = pcwd_isa_match, |
986 | 986 | .probe = pcwd_isa_probe, |
987 | - .remove = __devexit_p(pcwd_isa_remove), | |
987 | + .remove = pcwd_isa_remove, | |
988 | 988 | .shutdown = pcwd_isa_shutdown, |
989 | 989 | .driver = { |
990 | 990 | .owner = THIS_MODULE, |
drivers/watchdog/pcwd_pci.c
drivers/watchdog/pnx4008_wdt.c
drivers/watchdog/rc32434_wdt.c
... | ... | @@ -320,7 +320,7 @@ |
320 | 320 | |
321 | 321 | static struct platform_driver rc32434_wdt_driver = { |
322 | 322 | .probe = rc32434_wdt_probe, |
323 | - .remove = __devexit_p(rc32434_wdt_remove), | |
323 | + .remove = rc32434_wdt_remove, | |
324 | 324 | .shutdown = rc32434_wdt_shutdown, |
325 | 325 | .driver = { |
326 | 326 | .name = "rc32434_wdt", |
drivers/watchdog/rdc321x_wdt.c
drivers/watchdog/riowd.c
drivers/watchdog/s3c2410_wdt.c
... | ... | @@ -508,7 +508,7 @@ |
508 | 508 | |
509 | 509 | static struct platform_driver s3c2410wdt_driver = { |
510 | 510 | .probe = s3c2410wdt_probe, |
511 | - .remove = __devexit_p(s3c2410wdt_remove), | |
511 | + .remove = s3c2410wdt_remove, | |
512 | 512 | .shutdown = s3c2410wdt_shutdown, |
513 | 513 | .suspend = s3c2410wdt_suspend, |
514 | 514 | .resume = s3c2410wdt_resume, |
drivers/watchdog/sch311x_wdt.c
... | ... | @@ -451,7 +451,7 @@ |
451 | 451 | |
452 | 452 | static struct platform_driver sch311x_wdt_driver = { |
453 | 453 | .probe = sch311x_wdt_probe, |
454 | - .remove = __devexit_p(sch311x_wdt_remove), | |
454 | + .remove = sch311x_wdt_remove, | |
455 | 455 | .shutdown = sch311x_wdt_shutdown, |
456 | 456 | .driver = { |
457 | 457 | .owner = THIS_MODULE, |
drivers/watchdog/shwdt.c
drivers/watchdog/sp5100_tco.c
... | ... | @@ -439,7 +439,7 @@ |
439 | 439 | |
440 | 440 | static struct platform_driver sp5100_tco_driver = { |
441 | 441 | .probe = sp5100_tco_init, |
442 | - .remove = __devexit_p(sp5100_tco_remove), | |
442 | + .remove = sp5100_tco_remove, | |
443 | 443 | .shutdown = sp5100_tco_shutdown, |
444 | 444 | .driver = { |
445 | 445 | .owner = THIS_MODULE, |
drivers/watchdog/sp805_wdt.c
drivers/watchdog/stmp3xxx_wdt.c
drivers/watchdog/ts72xx_wdt.c
drivers/watchdog/twl4030_wdt.c
... | ... | @@ -247,7 +247,7 @@ |
247 | 247 | |
248 | 248 | static struct platform_driver twl4030_wdt_driver = { |
249 | 249 | .probe = twl4030_wdt_probe, |
250 | - .remove = __devexit_p(twl4030_wdt_remove), | |
250 | + .remove = twl4030_wdt_remove, | |
251 | 251 | .suspend = twl4030_wdt_suspend, |
252 | 252 | .resume = twl4030_wdt_resume, |
253 | 253 | .driver = { |
drivers/watchdog/via_wdt.c
drivers/watchdog/wdt_pci.c
drivers/watchdog/wm831x_wdt.c
drivers/watchdog/wm8350_wdt.c
drivers/watchdog/xen_wdt.c
... | ... | @@ -315,7 +315,7 @@ |
315 | 315 | |
316 | 316 | static struct platform_driver xen_wdt_driver = { |
317 | 317 | .probe = xen_wdt_probe, |
318 | - .remove = __devexit_p(xen_wdt_remove), | |
318 | + .remove = xen_wdt_remove, | |
319 | 319 | .shutdown = xen_wdt_shutdown, |
320 | 320 | .suspend = xen_wdt_suspend, |
321 | 321 | .resume = xen_wdt_resume, |