Commit 4b12b896c27c3b54592816606679f5b02f638930
Committed by
Greg Kroah-Hartman
1 parent
1d13136864
Exists in
smarc-l5.0.0_1.0.0-ga
and in
5 other branches
watchdog: remove use of __devexit
CONFIG_HOTPLUG is going away as an option so __devexit 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 52 changed files with 56 additions and 56 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/cpu5wdt.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/gef_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
drivers/watchdog/ath79_wdt.c
drivers/watchdog/bcm63xx_wdt.c
drivers/watchdog/bfin_wdt.c
... | ... | @@ -379,7 +379,7 @@ |
379 | 379 | * Unregisters the misc device. Actual device |
380 | 380 | * deinitialization is handled by bfin_wdt_close(). |
381 | 381 | */ |
382 | -static int __devexit bfin_wdt_remove(struct platform_device *pdev) | |
382 | +static int bfin_wdt_remove(struct platform_device *pdev) | |
383 | 383 | { |
384 | 384 | misc_deregister(&bfin_wdt_miscdev); |
385 | 385 | return 0; |
drivers/watchdog/cpu5wdt.c
... | ... | @@ -261,7 +261,7 @@ |
261 | 261 | return cpu5wdt_init(); |
262 | 262 | } |
263 | 263 | |
264 | -static void __devexit cpu5wdt_exit(void) | |
264 | +static void cpu5wdt_exit(void) | |
265 | 265 | { |
266 | 266 | if (cpu5wdt_device.queue) { |
267 | 267 | cpu5wdt_device.queue = 0; |
... | ... | @@ -274,7 +274,7 @@ |
274 | 274 | |
275 | 275 | } |
276 | 276 | |
277 | -static void __devexit cpu5wdt_exit_module(void) | |
277 | +static void cpu5wdt_exit_module(void) | |
278 | 278 | { |
279 | 279 | cpu5wdt_exit(); |
280 | 280 | } |
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/gef_wdt.c
drivers/watchdog/geodewdt.c
drivers/watchdog/hpwdt.c
drivers/watchdog/i6300esb.c
drivers/watchdog/iTCO_wdt.c
... | ... | @@ -364,7 +364,7 @@ |
364 | 364 | * Init & exit routines |
365 | 365 | */ |
366 | 366 | |
367 | -static void __devexit iTCO_wdt_cleanup(void) | |
367 | +static void iTCO_wdt_cleanup(void) | |
368 | 368 | { |
369 | 369 | /* Stop the timer before we leave */ |
370 | 370 | if (!nowayout) |
... | ... | @@ -533,7 +533,7 @@ |
533 | 533 | return ret; |
534 | 534 | } |
535 | 535 | |
536 | -static int __devexit iTCO_wdt_remove(struct platform_device *dev) | |
536 | +static int iTCO_wdt_remove(struct platform_device *dev) | |
537 | 537 | { |
538 | 538 | if (iTCO_wdt_private.tco_res || iTCO_wdt_private.smi_res) |
539 | 539 | iTCO_wdt_cleanup(); |
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
... | ... | @@ -209,7 +209,7 @@ |
209 | 209 | return watchdog_register_device(&max63xx_wdt_dev); |
210 | 210 | } |
211 | 211 | |
212 | -static int __devexit max63xx_wdt_remove(struct platform_device *pdev) | |
212 | +static int max63xx_wdt_remove(struct platform_device *pdev) | |
213 | 213 | { |
214 | 214 | watchdog_unregister_device(&max63xx_wdt_dev); |
215 | 215 | return 0; |
drivers/watchdog/mpc8xxx_wdt.c
... | ... | @@ -245,7 +245,7 @@ |
245 | 245 | return ret; |
246 | 246 | } |
247 | 247 | |
248 | -static int __devexit mpc8xxx_wdt_remove(struct platform_device *ofdev) | |
248 | +static int mpc8xxx_wdt_remove(struct platform_device *ofdev) | |
249 | 249 | { |
250 | 250 | mpc8xxx_wdt_pr_warn("watchdog removed"); |
251 | 251 | del_timer_sync(&wdt_timer); |
drivers/watchdog/mpcore_wdt.c
drivers/watchdog/mtx-1_wdt.c
drivers/watchdog/mv64x60_wdt.c
... | ... | @@ -287,7 +287,7 @@ |
287 | 287 | return misc_register(&mv64x60_wdt_miscdev); |
288 | 288 | } |
289 | 289 | |
290 | -static int __devexit mv64x60_wdt_remove(struct platform_device *dev) | |
290 | +static int mv64x60_wdt_remove(struct platform_device *dev) | |
291 | 291 | { |
292 | 292 | misc_deregister(&mv64x60_wdt_miscdev); |
293 | 293 |
drivers/watchdog/nuc900_wdt.c
drivers/watchdog/nv_tco.c
... | ... | @@ -423,7 +423,7 @@ |
423 | 423 | return ret; |
424 | 424 | } |
425 | 425 | |
426 | -static void __devexit nv_tco_cleanup(void) | |
426 | +static void nv_tco_cleanup(void) | |
427 | 427 | { |
428 | 428 | u32 val; |
429 | 429 | |
... | ... | @@ -445,7 +445,7 @@ |
445 | 445 | release_region(tcobase, 0x10); |
446 | 446 | } |
447 | 447 | |
448 | -static int __devexit nv_tco_remove(struct platform_device *dev) | |
448 | +static int nv_tco_remove(struct platform_device *dev) | |
449 | 449 | { |
450 | 450 | if (tcobase) |
451 | 451 | nv_tco_cleanup(); |
drivers/watchdog/of_xilinx_wdt.c
drivers/watchdog/omap_wdt.c
... | ... | @@ -359,7 +359,7 @@ |
359 | 359 | } |
360 | 360 | } |
361 | 361 | |
362 | -static int __devexit omap_wdt_remove(struct platform_device *pdev) | |
362 | +static int omap_wdt_remove(struct platform_device *pdev) | |
363 | 363 | { |
364 | 364 | struct omap_wdt_dev *wdev = platform_get_drvdata(pdev); |
365 | 365 | struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
drivers/watchdog/orion_wdt.c
drivers/watchdog/pcwd.c
... | ... | @@ -949,7 +949,7 @@ |
949 | 949 | return ret; |
950 | 950 | } |
951 | 951 | |
952 | -static int __devexit pcwd_isa_remove(struct device *dev, unsigned int id) | |
952 | +static int pcwd_isa_remove(struct device *dev, unsigned int id) | |
953 | 953 | { |
954 | 954 | if (debug >= DEBUG) |
955 | 955 | pr_debug("pcwd_isa_remove id=%d\n", id); |
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
... | ... | @@ -412,7 +412,7 @@ |
412 | 412 | return ret; |
413 | 413 | } |
414 | 414 | |
415 | -static void __devexit sp5100_tco_cleanup(void) | |
415 | +static void sp5100_tco_cleanup(void) | |
416 | 416 | { |
417 | 417 | /* Stop the timer before we leave */ |
418 | 418 | if (!nowayout) |
... | ... | @@ -425,7 +425,7 @@ |
425 | 425 | release_region(pm_iobase, SP5100_PM_IOPORTS_SIZE); |
426 | 426 | } |
427 | 427 | |
428 | -static int __devexit sp5100_tco_remove(struct platform_device *dev) | |
428 | +static int sp5100_tco_remove(struct platform_device *dev) | |
429 | 429 | { |
430 | 430 | if (tcobase) |
431 | 431 | sp5100_tco_cleanup(); |
drivers/watchdog/sp805_wdt.c
drivers/watchdog/stmp3xxx_wdt.c
drivers/watchdog/ts72xx_wdt.c
... | ... | @@ -476,7 +476,7 @@ |
476 | 476 | return error; |
477 | 477 | } |
478 | 478 | |
479 | -static __devexit int ts72xx_wdt_remove(struct platform_device *pdev) | |
479 | +static int ts72xx_wdt_remove(struct platform_device *pdev) | |
480 | 480 | { |
481 | 481 | struct ts72xx_wdt *wdt = platform_get_drvdata(pdev); |
482 | 482 | struct resource *res; |
drivers/watchdog/twl4030_wdt.c
drivers/watchdog/via_wdt.c
drivers/watchdog/wdt_pci.c
... | ... | @@ -705,7 +705,7 @@ |
705 | 705 | } |
706 | 706 | |
707 | 707 | |
708 | -static void __devexit wdtpci_remove_one(struct pci_dev *pdev) | |
708 | +static void wdtpci_remove_one(struct pci_dev *pdev) | |
709 | 709 | { |
710 | 710 | /* here we assume only one device will ever have |
711 | 711 | * been picked up and registered by probe function */ |
drivers/watchdog/wm831x_wdt.c
drivers/watchdog/wm8350_wdt.c
... | ... | @@ -158,7 +158,7 @@ |
158 | 158 | return watchdog_register_device(&wm8350_wdt); |
159 | 159 | } |
160 | 160 | |
161 | -static int __devexit wm8350_wdt_remove(struct platform_device *pdev) | |
161 | +static int wm8350_wdt_remove(struct platform_device *pdev) | |
162 | 162 | { |
163 | 163 | watchdog_unregister_device(&wm8350_wdt); |
164 | 164 | return 0; |
drivers/watchdog/xen_wdt.c