Commit 82268714bdf06bc06135efb707a9de590ab2d294

Authored by Bill Pemberton
Committed by Greg Kroah-Hartman
1 parent f90f54b3f3

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
... ... @@ -293,7 +293,7 @@
293 293  
294 294 static struct platform_driver acquirewdt_driver = {
295 295 .probe = acq_probe,
296   - .remove = __devexit_p(acq_remove),
  296 + .remove = acq_remove,
297 297 .shutdown = acq_shutdown,
298 298 .driver = {
299 299 .owner = THIS_MODULE,
drivers/watchdog/advantechwdt.c
... ... @@ -300,7 +300,7 @@
300 300  
301 301 static struct platform_driver advwdt_driver = {
302 302 .probe = advwdt_probe,
303   - .remove = __devexit_p(advwdt_remove),
  303 + .remove = advwdt_remove,
304 304 .shutdown = advwdt_shutdown,
305 305 .driver = {
306 306 .owner = THIS_MODULE,
drivers/watchdog/ar7_wdt.c
... ... @@ -330,7 +330,7 @@
330 330  
331 331 static struct platform_driver ar7_wdt_driver = {
332 332 .probe = ar7_wdt_probe,
333   - .remove = __devexit_p(ar7_wdt_remove),
  333 + .remove = ar7_wdt_remove,
334 334 .shutdown = ar7_wdt_shutdown,
335 335 .driver = {
336 336 .owner = THIS_MODULE,
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
... ... @@ -284,7 +284,7 @@
284 284 }
285 285  
286 286 static struct platform_driver ath79_wdt_driver = {
287   - .remove = __devexit_p(ath79_wdt_remove),
  287 + .remove = ath79_wdt_remove,
288 288 .shutdown = ath97_wdt_shutdown,
289 289 .driver = {
290 290 .name = DRIVER_NAME,
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
... ... @@ -684,7 +684,7 @@
684 684 .of_match_table = cpwd_match,
685 685 },
686 686 .probe = cpwd_probe,
687   - .remove = __devexit_p(cpwd_remove),
  687 + .remove = cpwd_remove,
688 688 };
689 689  
690 690 module_platform_driver(cpwd_driver);
drivers/watchdog/da9052_wdt.c
... ... @@ -236,7 +236,7 @@
236 236  
237 237 static struct platform_driver da9052_wdt_driver = {
238 238 .probe = da9052_wdt_probe,
239   - .remove = __devexit_p(da9052_wdt_remove),
  239 + .remove = da9052_wdt_remove,
240 240 .driver = {
241 241 .name = "da9052-watchdog",
242 242 },
drivers/watchdog/davinci_wdt.c
... ... @@ -268,7 +268,7 @@
268 268 .owner = THIS_MODULE,
269 269 },
270 270 .probe = davinci_wdt_probe,
271   - .remove = __devexit_p(davinci_wdt_remove),
  271 + .remove = davinci_wdt_remove,
272 272 };
273 273  
274 274 module_platform_driver(platform_wdt_driver);
drivers/watchdog/dw_wdt.c
... ... @@ -345,7 +345,7 @@
345 345  
346 346 static struct platform_driver dw_wdt_driver = {
347 347 .probe = dw_wdt_drv_probe,
348   - .remove = __devexit_p(dw_wdt_drv_remove),
  348 + .remove = dw_wdt_drv_remove,
349 349 .driver = {
350 350 .name = "dw_wdt",
351 351 .owner = THIS_MODULE,
drivers/watchdog/ep93xx_wdt.c
... ... @@ -168,7 +168,7 @@
168 168 .name = "ep93xx-wdt",
169 169 },
170 170 .probe = ep93xx_wdt_probe,
171   - .remove = __devexit_p(ep93xx_wdt_remove),
  171 + .remove = ep93xx_wdt_remove,
172 172 };
173 173  
174 174 module_platform_driver(ep93xx_wdt_driver);
drivers/watchdog/geodewdt.c
... ... @@ -256,7 +256,7 @@
256 256  
257 257 static struct platform_driver geodewdt_driver = {
258 258 .probe = geodewdt_probe,
259   - .remove = __devexit_p(geodewdt_remove),
  259 + .remove = geodewdt_remove,
260 260 .shutdown = geodewdt_shutdown,
261 261 .driver = {
262 262 .owner = THIS_MODULE,
drivers/watchdog/hpwdt.c
... ... @@ -863,7 +863,7 @@
863 863 .name = "hpwdt",
864 864 .id_table = hpwdt_devices,
865 865 .probe = hpwdt_init_one,
866   - .remove = __devexit_p(hpwdt_exit),
  866 + .remove = hpwdt_exit,
867 867 };
868 868  
869 869 MODULE_AUTHOR("Tom Mingarelli");
drivers/watchdog/i6300esb.c
... ... @@ -488,7 +488,7 @@
488 488 .name = ESB_MODULE_NAME,
489 489 .id_table = esb_pci_tbl,
490 490 .probe = esb_probe,
491   - .remove = __devexit_p(esb_remove),
  491 + .remove = esb_remove,
492 492 .shutdown = esb_shutdown,
493 493 };
494 494  
drivers/watchdog/iTCO_wdt.c
... ... @@ -548,7 +548,7 @@
548 548  
549 549 static struct platform_driver iTCO_wdt_driver = {
550 550 .probe = iTCO_wdt_probe,
551   - .remove = __devexit_p(iTCO_wdt_remove),
  551 + .remove = iTCO_wdt_remove,
552 552 .shutdown = iTCO_wdt_shutdown,
553 553 .driver = {
554 554 .owner = THIS_MODULE,
drivers/watchdog/ib700wdt.c
... ... @@ -337,7 +337,7 @@
337 337  
338 338 static struct platform_driver ibwdt_driver = {
339 339 .probe = ibwdt_probe,
340   - .remove = __devexit_p(ibwdt_remove),
  340 + .remove = ibwdt_remove,
341 341 .shutdown = ibwdt_shutdown,
342 342 .driver = {
343 343 .owner = THIS_MODULE,
drivers/watchdog/ie6xx_wdt.c
... ... @@ -311,7 +311,7 @@
311 311  
312 312 static struct platform_driver ie6xx_wdt_driver = {
313 313 .probe = ie6xx_wdt_probe,
314   - .remove = __devexit_p(ie6xx_wdt_remove),
  314 + .remove = ie6xx_wdt_remove,
315 315 .driver = {
316 316 .name = DRIVER_NAME,
317 317 .owner = THIS_MODULE,
drivers/watchdog/jz4740_wdt.c
... ... @@ -210,7 +210,7 @@
210 210  
211 211 static struct platform_driver jz4740_wdt_driver = {
212 212 .probe = jz4740_wdt_probe,
213   - .remove = __devexit_p(jz4740_wdt_remove),
  213 + .remove = jz4740_wdt_remove,
214 214 .driver = {
215 215 .name = "jz4740-wdt",
216 216 .owner = THIS_MODULE,
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
... ... @@ -236,7 +236,7 @@
236 236  
237 237 static struct platform_driver ltq_wdt_driver = {
238 238 .probe = ltq_wdt_probe,
239   - .remove = __devexit_p(ltq_wdt_remove),
  239 + .remove = ltq_wdt_remove,
240 240 .driver = {
241 241 .name = "wdt",
242 242 .owner = THIS_MODULE,
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
... ... @@ -281,7 +281,7 @@
281 281  
282 282 static struct platform_driver mpc8xxx_wdt_driver = {
283 283 .probe = mpc8xxx_wdt_probe,
284   - .remove = __devexit_p(mpc8xxx_wdt_remove),
  284 + .remove = mpc8xxx_wdt_remove,
285 285 .driver = {
286 286 .name = "mpc8xxx_wdt",
287 287 .owner = THIS_MODULE,
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
... ... @@ -248,7 +248,7 @@
248 248  
249 249 static struct platform_driver mtx1_wdt_driver = {
250 250 .probe = mtx1_wdt_probe,
251   - .remove = __devexit_p(mtx1_wdt_remove),
  251 + .remove = mtx1_wdt_remove,
252 252 .driver.name = "mtx1-wdt",
253 253 .driver.owner = THIS_MODULE,
254 254 };
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
... ... @@ -328,7 +328,7 @@
328 328  
329 329 static struct platform_driver nuc900wdt_driver = {
330 330 .probe = nuc900wdt_probe,
331   - .remove = __devexit_p(nuc900wdt_remove),
  331 + .remove = nuc900wdt_remove,
332 332 .driver = {
333 333 .name = "nuc900-wdt",
334 334 .owner = THIS_MODULE,
drivers/watchdog/nv_tco.c
... ... @@ -468,7 +468,7 @@
468 468  
469 469 static struct platform_driver nv_tco_driver = {
470 470 .probe = nv_tco_init,
471   - .remove = __devexit_p(nv_tco_remove),
  471 + .remove = nv_tco_remove,
472 472 .shutdown = nv_tco_shutdown,
473 473 .driver = {
474 474 .owner = THIS_MODULE,
drivers/watchdog/of_xilinx_wdt.c
... ... @@ -401,7 +401,7 @@
401 401  
402 402 static struct platform_driver xwdt_driver = {
403 403 .probe = xwdt_probe,
404   - .remove = __devexit_p(xwdt_remove),
  404 + .remove = xwdt_remove,
405 405 .driver = {
406 406 .owner = THIS_MODULE,
407 407 .name = WATCHDOG_NAME,
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
... ... @@ -201,7 +201,7 @@
201 201  
202 202 static struct platform_driver orion_wdt_driver = {
203 203 .probe = orion_wdt_probe,
204   - .remove = __devexit_p(orion_wdt_remove),
  204 + .remove = orion_wdt_remove,
205 205 .shutdown = orion_wdt_shutdown,
206 206 .driver = {
207 207 .owner = THIS_MODULE,
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
... ... @@ -812,7 +812,7 @@
812 812 .name = WATCHDOG_NAME,
813 813 .id_table = pcipcwd_pci_tbl,
814 814 .probe = pcipcwd_card_init,
815   - .remove = __devexit_p(pcipcwd_card_exit),
  815 + .remove = pcipcwd_card_exit,
816 816 };
817 817  
818 818 module_pci_driver(pcipcwd_driver);
drivers/watchdog/pnx4008_wdt.c
... ... @@ -217,7 +217,7 @@
217 217 .of_match_table = of_match_ptr(pnx4008_wdt_match),
218 218 },
219 219 .probe = pnx4008_wdt_probe,
220   - .remove = __devexit_p(pnx4008_wdt_remove),
  220 + .remove = pnx4008_wdt_remove,
221 221 };
222 222  
223 223 module_platform_driver(platform_wdt_driver);
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
... ... @@ -286,7 +286,7 @@
286 286  
287 287 static struct platform_driver rdc321x_wdt_driver = {
288 288 .probe = rdc321x_wdt_probe,
289   - .remove = __devexit_p(rdc321x_wdt_remove),
  289 + .remove = rdc321x_wdt_remove,
290 290 .driver = {
291 291 .owner = THIS_MODULE,
292 292 .name = "rdc321x-wdt",
drivers/watchdog/riowd.c
... ... @@ -246,7 +246,7 @@
246 246 .of_match_table = riowd_match,
247 247 },
248 248 .probe = riowd_probe,
249   - .remove = __devexit_p(riowd_remove),
  249 + .remove = riowd_remove,
250 250 };
251 251  
252 252 module_platform_driver(riowd_driver);
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
... ... @@ -324,7 +324,7 @@
324 324 },
325 325  
326 326 .probe = sh_wdt_probe,
327   - .remove = __devexit_p(sh_wdt_remove),
  327 + .remove = sh_wdt_remove,
328 328 .shutdown = sh_wdt_shutdown,
329 329 };
330 330  
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
... ... @@ -326,7 +326,7 @@
326 326 },
327 327 .id_table = sp805_wdt_ids,
328 328 .probe = sp805_wdt_probe,
329   - .remove = __devexit_p(sp805_wdt_remove),
  329 + .remove = sp805_wdt_remove,
330 330 };
331 331  
332 332 module_amba_driver(sp805_wdt_driver);
drivers/watchdog/stmp3xxx_wdt.c
... ... @@ -269,7 +269,7 @@
269 269 .name = "stmp3xxx_wdt",
270 270 },
271 271 .probe = stmp3xxx_wdt_probe,
272   - .remove = __devexit_p(stmp3xxx_wdt_remove),
  272 + .remove = stmp3xxx_wdt_remove,
273 273 .suspend = stmp3xxx_wdt_suspend,
274 274 .resume = stmp3xxx_wdt_resume,
275 275 };
drivers/watchdog/ts72xx_wdt.c
... ... @@ -499,7 +499,7 @@
499 499  
500 500 static struct platform_driver ts72xx_wdt_driver = {
501 501 .probe = ts72xx_wdt_probe,
502   - .remove = __devexit_p(ts72xx_wdt_remove),
  502 + .remove = ts72xx_wdt_remove,
503 503 .driver = {
504 504 .name = "ts72xx-wdt",
505 505 .owner = THIS_MODULE,
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
... ... @@ -250,7 +250,7 @@
250 250 .name = "via_wdt",
251 251 .id_table = wdt_pci_table,
252 252 .probe = wdt_probe,
253   - .remove = __devexit_p(wdt_remove),
  253 + .remove = wdt_remove,
254 254 };
255 255  
256 256 module_pci_driver(wdt_driver);
drivers/watchdog/wdt_pci.c
... ... @@ -736,7 +736,7 @@
736 736 .name = "wdt_pci",
737 737 .id_table = wdtpci_pci_tbl,
738 738 .probe = wdtpci_init_one,
739   - .remove = __devexit_p(wdtpci_remove_one),
  739 + .remove = wdtpci_remove_one,
740 740 };
741 741  
742 742 module_pci_driver(wdtpci_driver);
drivers/watchdog/wm831x_wdt.c
... ... @@ -306,7 +306,7 @@
306 306  
307 307 static struct platform_driver wm831x_wdt_driver = {
308 308 .probe = wm831x_wdt_probe,
309   - .remove = __devexit_p(wm831x_wdt_remove),
  309 + .remove = wm831x_wdt_remove,
310 310 .driver = {
311 311 .name = "wm831x-watchdog",
312 312 },
drivers/watchdog/wm8350_wdt.c
... ... @@ -166,7 +166,7 @@
166 166  
167 167 static struct platform_driver wm8350_wdt_driver = {
168 168 .probe = wm8350_wdt_probe,
169   - .remove = __devexit_p(wm8350_wdt_remove),
  169 + .remove = wm8350_wdt_remove,
170 170 .driver = {
171 171 .name = "wm8350-wdt",
172 172 },
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,