Commit 4b12b896c27c3b54592816606679f5b02f638930

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

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
... ... @@ -275,7 +275,7 @@
275 275 return ret;
276 276 }
277 277  
278   -static int __devexit acq_remove(struct platform_device *dev)
  278 +static int acq_remove(struct platform_device *dev)
279 279 {
280 280 misc_deregister(&acq_miscdev);
281 281 release_region(wdt_start, 1);
drivers/watchdog/advantechwdt.c
... ... @@ -282,7 +282,7 @@
282 282 goto out;
283 283 }
284 284  
285   -static int __devexit advwdt_remove(struct platform_device *dev)
  285 +static int advwdt_remove(struct platform_device *dev)
286 286 {
287 287 misc_deregister(&advwdt_miscdev);
288 288 release_region(wdt_start, 1);
drivers/watchdog/ar7_wdt.c
... ... @@ -314,7 +314,7 @@
314 314 return rc;
315 315 }
316 316  
317   -static int __devexit ar7_wdt_remove(struct platform_device *pdev)
  317 +static int ar7_wdt_remove(struct platform_device *pdev)
318 318 {
319 319 misc_deregister(&ar7_wdt_miscdev);
320 320 clk_put(vbus_clk);
drivers/watchdog/at91rm9200_wdt.c
... ... @@ -216,7 +216,7 @@
216 216 return 0;
217 217 }
218 218  
219   -static int __devexit at91wdt_remove(struct platform_device *pdev)
  219 +static int at91wdt_remove(struct platform_device *pdev)
220 220 {
221 221 int res;
222 222  
drivers/watchdog/ath79_wdt.c
... ... @@ -270,7 +270,7 @@
270 270 return err;
271 271 }
272 272  
273   -static int __devexit ath79_wdt_remove(struct platform_device *pdev)
  273 +static int ath79_wdt_remove(struct platform_device *pdev)
274 274 {
275 275 misc_deregister(&ath79_wdt_miscdev);
276 276 clk_disable(wdt_clk);
drivers/watchdog/bcm63xx_wdt.c
... ... @@ -286,7 +286,7 @@
286 286 return ret;
287 287 }
288 288  
289   -static int __devexit bcm63xx_wdt_remove(struct platform_device *pdev)
  289 +static int bcm63xx_wdt_remove(struct platform_device *pdev)
290 290 {
291 291 if (!nowayout)
292 292 bcm63xx_wdt_pause();
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
... ... @@ -640,7 +640,7 @@
640 640 goto out;
641 641 }
642 642  
643   -static int __devexit cpwd_remove(struct platform_device *op)
  643 +static int cpwd_remove(struct platform_device *op)
644 644 {
645 645 struct cpwd *p = dev_get_drvdata(&op->dev);
646 646 int i;
drivers/watchdog/da9052_wdt.c
... ... @@ -224,7 +224,7 @@
224 224 return ret;
225 225 }
226 226  
227   -static int __devexit da9052_wdt_remove(struct platform_device *pdev)
  227 +static int da9052_wdt_remove(struct platform_device *pdev)
228 228 {
229 229 struct da9052_wdt_data *driver_data = dev_get_drvdata(&pdev->dev);
230 230  
drivers/watchdog/davinci_wdt.c
... ... @@ -248,7 +248,7 @@
248 248 return ret;
249 249 }
250 250  
251   -static int __devexit davinci_wdt_remove(struct platform_device *pdev)
  251 +static int davinci_wdt_remove(struct platform_device *pdev)
252 252 {
253 253 misc_deregister(&davinci_wdt_miscdev);
254 254 if (wdt_mem) {
drivers/watchdog/dw_wdt.c
... ... @@ -333,7 +333,7 @@
333 333 return ret;
334 334 }
335 335  
336   -static int __devexit dw_wdt_drv_remove(struct platform_device *pdev)
  336 +static int dw_wdt_drv_remove(struct platform_device *pdev)
337 337 {
338 338 misc_deregister(&dw_wdt_miscdev);
339 339  
drivers/watchdog/ep93xx_wdt.c
... ... @@ -156,7 +156,7 @@
156 156 return 0;
157 157 }
158 158  
159   -static int __devexit ep93xx_wdt_remove(struct platform_device *pdev)
  159 +static int ep93xx_wdt_remove(struct platform_device *pdev)
160 160 {
161 161 watchdog_unregister_device(&ep93xx_wdt_wdd);
162 162 return 0;
drivers/watchdog/gef_wdt.c
... ... @@ -285,7 +285,7 @@
285 285 return misc_register(&gef_wdt_miscdev);
286 286 }
287 287  
288   -static int __devexit gef_wdt_remove(struct platform_device *dev)
  288 +static int gef_wdt_remove(struct platform_device *dev)
289 289 {
290 290 misc_deregister(&gef_wdt_miscdev);
291 291  
drivers/watchdog/geodewdt.c
... ... @@ -243,7 +243,7 @@
243 243 return ret;
244 244 }
245 245  
246   -static int __devexit geodewdt_remove(struct platform_device *dev)
  246 +static int geodewdt_remove(struct platform_device *dev)
247 247 {
248 248 misc_deregister(&geodewdt_miscdev);
249 249 return 0;
drivers/watchdog/hpwdt.c
... ... @@ -848,7 +848,7 @@
848 848 return retval;
849 849 }
850 850  
851   -static void __devexit hpwdt_exit(struct pci_dev *dev)
  851 +static void hpwdt_exit(struct pci_dev *dev)
852 852 {
853 853 if (!nowayout)
854 854 hpwdt_stop();
drivers/watchdog/i6300esb.c
... ... @@ -465,7 +465,7 @@
465 465 return ret;
466 466 }
467 467  
468   -static void __devexit esb_remove(struct pci_dev *pdev)
  468 +static void esb_remove(struct pci_dev *pdev)
469 469 {
470 470 /* Stop the timer before we leave */
471 471 if (!nowayout)
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
... ... @@ -319,7 +319,7 @@
319 319 return res;
320 320 }
321 321  
322   -static int __devexit ibwdt_remove(struct platform_device *dev)
  322 +static int ibwdt_remove(struct platform_device *dev)
323 323 {
324 324 misc_deregister(&ibwdt_miscdev);
325 325 release_region(WDT_START, 1);
drivers/watchdog/ie6xx_wdt.c
... ... @@ -295,7 +295,7 @@
295 295 return ret;
296 296 }
297 297  
298   -static int __devexit ie6xx_wdt_remove(struct platform_device *pdev)
  298 +static int ie6xx_wdt_remove(struct platform_device *pdev)
299 299 {
300 300 struct resource *res;
301 301  
drivers/watchdog/jz4740_wdt.c
... ... @@ -197,7 +197,7 @@
197 197 return ret;
198 198 }
199 199  
200   -static int __devexit jz4740_wdt_remove(struct platform_device *pdev)
  200 +static int jz4740_wdt_remove(struct platform_device *pdev)
201 201 {
202 202 struct jz4740_wdt_drvdata *drvdata = platform_get_drvdata(pdev);
203 203  
drivers/watchdog/ks8695_wdt.c
... ... @@ -252,7 +252,7 @@
252 252 return 0;
253 253 }
254 254  
255   -static int __devexit ks8695wdt_remove(struct platform_device *pdev)
  255 +static int ks8695wdt_remove(struct platform_device *pdev)
256 256 {
257 257 int res;
258 258  
drivers/watchdog/lantiq_wdt.c
... ... @@ -220,7 +220,7 @@
220 220 return misc_register(&ltq_wdt_miscdev);
221 221 }
222 222  
223   -static int __devexit
  223 +static int
224 224 ltq_wdt_remove(struct platform_device *pdev)
225 225 {
226 226 misc_deregister(&ltq_wdt_miscdev);
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
... ... @@ -378,7 +378,7 @@
378 378 return 0;
379 379 }
380 380  
381   -static int __devexit mpcore_wdt_remove(struct platform_device *pdev)
  381 +static int mpcore_wdt_remove(struct platform_device *pdev)
382 382 {
383 383 platform_set_drvdata(pdev, NULL);
384 384  
drivers/watchdog/mtx-1_wdt.c
... ... @@ -233,7 +233,7 @@
233 233 return 0;
234 234 }
235 235  
236   -static int __devexit mtx1_wdt_remove(struct platform_device *pdev)
  236 +static int mtx1_wdt_remove(struct platform_device *pdev)
237 237 {
238 238 /* FIXME: do we need to lock this test ? */
239 239 if (mtx1_wdt_device.queue) {
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
... ... @@ -309,7 +309,7 @@
309 309 return ret;
310 310 }
311 311  
312   -static int __devexit nuc900wdt_remove(struct platform_device *pdev)
  312 +static int nuc900wdt_remove(struct platform_device *pdev)
313 313 {
314 314 misc_deregister(&nuc900wdt_miscdev);
315 315  
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
... ... @@ -383,7 +383,7 @@
383 383 return rc;
384 384 }
385 385  
386   -static int __devexit xwdt_remove(struct platform_device *dev)
  386 +static int xwdt_remove(struct platform_device *dev)
387 387 {
388 388 misc_deregister(&xwdt_miscdev);
389 389 iounmap(xdev.base);
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
... ... @@ -181,7 +181,7 @@
181 181 return 0;
182 182 }
183 183  
184   -static int __devexit orion_wdt_remove(struct platform_device *pdev)
  184 +static int orion_wdt_remove(struct platform_device *pdev)
185 185 {
186 186 watchdog_unregister_device(&orion_wdt);
187 187 clk_disable_unprepare(clk);
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
... ... @@ -785,7 +785,7 @@
785 785 return ret;
786 786 }
787 787  
788   -static void __devexit pcipcwd_card_exit(struct pci_dev *pdev)
  788 +static void pcipcwd_card_exit(struct pci_dev *pdev)
789 789 {
790 790 /* Stop the timer before we leave */
791 791 if (!nowayout)
drivers/watchdog/pnx4008_wdt.c
... ... @@ -192,7 +192,7 @@
192 192 return ret;
193 193 }
194 194  
195   -static int __devexit pnx4008_wdt_remove(struct platform_device *pdev)
  195 +static int pnx4008_wdt_remove(struct platform_device *pdev)
196 196 {
197 197 watchdog_unregister_device(&pnx4008_wdd);
198 198  
drivers/watchdog/rc32434_wdt.c
... ... @@ -306,7 +306,7 @@
306 306 return ret;
307 307 }
308 308  
309   -static int __devexit rc32434_wdt_remove(struct platform_device *pdev)
  309 +static int rc32434_wdt_remove(struct platform_device *pdev)
310 310 {
311 311 misc_deregister(&rc32434_wdt_miscdev);
312 312 iounmap(wdt_reg);
drivers/watchdog/rdc321x_wdt.c
... ... @@ -272,7 +272,7 @@
272 272 return 0;
273 273 }
274 274  
275   -static int __devexit rdc321x_wdt_remove(struct platform_device *pdev)
  275 +static int rdc321x_wdt_remove(struct platform_device *pdev)
276 276 {
277 277 if (rdc321x_wdt_device.queue) {
278 278 rdc321x_wdt_device.queue = 0;
drivers/watchdog/riowd.c
... ... @@ -220,7 +220,7 @@
220 220 return err;
221 221 }
222 222  
223   -static int __devexit riowd_remove(struct platform_device *op)
  223 +static int riowd_remove(struct platform_device *op)
224 224 {
225 225 struct riowd *p = dev_get_drvdata(&op->dev);
226 226  
drivers/watchdog/s3c2410_wdt.c
... ... @@ -437,7 +437,7 @@
437 437 return ret;
438 438 }
439 439  
440   -static int __devexit s3c2410wdt_remove(struct platform_device *dev)
  440 +static int s3c2410wdt_remove(struct platform_device *dev)
441 441 {
442 442 watchdog_unregister_device(&s3c2410_wdd);
443 443  
drivers/watchdog/sch311x_wdt.c
... ... @@ -429,7 +429,7 @@
429 429 return err;
430 430 }
431 431  
432   -static int __devexit sch311x_wdt_remove(struct platform_device *pdev)
  432 +static int sch311x_wdt_remove(struct platform_device *pdev)
433 433 {
434 434 /* Stop the timer before we leave */
435 435 if (!nowayout)
drivers/watchdog/shwdt.c
... ... @@ -298,7 +298,7 @@
298 298 return rc;
299 299 }
300 300  
301   -static int __devexit sh_wdt_remove(struct platform_device *pdev)
  301 +static int sh_wdt_remove(struct platform_device *pdev)
302 302 {
303 303 struct sh_wdt *wdt = platform_get_drvdata(pdev);
304 304  
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
... ... @@ -272,7 +272,7 @@
272 272 return ret;
273 273 }
274 274  
275   -static int __devexit sp805_wdt_remove(struct amba_device *adev)
  275 +static int sp805_wdt_remove(struct amba_device *adev)
276 276 {
277 277 struct sp805_wdt *wdt = amba_get_drvdata(adev);
278 278  
drivers/watchdog/stmp3xxx_wdt.c
... ... @@ -229,7 +229,7 @@
229 229 return ret;
230 230 }
231 231  
232   -static int __devexit stmp3xxx_wdt_remove(struct platform_device *pdev)
  232 +static int stmp3xxx_wdt_remove(struct platform_device *pdev)
233 233 {
234 234 misc_deregister(&stmp3xxx_wdt_miscdev);
235 235 return 0;
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
... ... @@ -204,7 +204,7 @@
204 204 return 0;
205 205 }
206 206  
207   -static int __devexit twl4030_wdt_remove(struct platform_device *pdev)
  207 +static int twl4030_wdt_remove(struct platform_device *pdev)
208 208 {
209 209 struct twl4030_wdt *wdt = platform_get_drvdata(pdev);
210 210  
drivers/watchdog/via_wdt.c
... ... @@ -229,7 +229,7 @@
229 229 return ret;
230 230 }
231 231  
232   -static void __devexit wdt_remove(struct pci_dev *pdev)
  232 +static void wdt_remove(struct pci_dev *pdev)
233 233 {
234 234 watchdog_unregister_device(&wdt_dev);
235 235 del_timer(&timer);
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
... ... @@ -292,7 +292,7 @@
292 292 return ret;
293 293 }
294 294  
295   -static int __devexit wm831x_wdt_remove(struct platform_device *pdev)
  295 +static int wm831x_wdt_remove(struct platform_device *pdev)
296 296 {
297 297 struct wm831x_wdt_drvdata *driver_data = dev_get_drvdata(&pdev->dev);
298 298  
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
... ... @@ -280,7 +280,7 @@
280 280 return ret;
281 281 }
282 282  
283   -static int __devexit xen_wdt_remove(struct platform_device *dev)
  283 +static int xen_wdt_remove(struct platform_device *dev)
284 284 {
285 285 /* Stop the timer before we leave */
286 286 if (!nowayout)