Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 1850514b3ebde0f5eeedbe918a7d0d344b752653

Authored by Greg Kroah-Hartman
1 parent 163247c1d2
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

Drivers: clocksource: remove __dev* attributes. 

CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
markings need to be removed.

This change removes the use of __devinit, __devexit_p, __devinitdata,
__devinitconst, and __devexit from these drivers.

Based on patches originally written by Bill Pemberton, but redone by me
in order to handle some of the coding style issues better, by hand.

Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: John Stultz <johnstul@us.ibm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 5 changed files with 16 additions and 16 deletions Side-by-side Diff

drivers/clocksource/acpi_pm.c
Diff comments   View file @ 1850514
... ... @@ -73,7 +73,7 @@
73 73  
74 74  
75 75 #ifdef CONFIG_PCI
76   -static int __devinitdata acpi_pm_good;
  76 +static int acpi_pm_good;
77 77 static int __init acpi_pm_good_setup(char *__str)
78 78 {
79 79 acpi_pm_good = 1;
... ... @@ -102,7 +102,7 @@
102 102 * incorrect when read). As a result, the ACPI free running count up
103 103 * timer specification is violated due to erroneous reads.
104 104 */
105   -static void __devinit acpi_pm_check_blacklist(struct pci_dev *dev)
  105 +static void acpi_pm_check_blacklist(struct pci_dev *dev)
106 106 {
107 107 if (acpi_pm_good)
108 108 return;
... ... @@ -120,7 +120,7 @@
120 120 DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB_3,
121 121 acpi_pm_check_blacklist);
122 122  
123   -static void __devinit acpi_pm_check_graylist(struct pci_dev *dev)
  123 +static void acpi_pm_check_graylist(struct pci_dev *dev)
124 124 {
125 125 if (acpi_pm_good)
126 126 return;
drivers/clocksource/em_sti.c
Diff comments   View file @ 1850514
... ... @@ -311,7 +311,7 @@
311 311 clockevents_config_and_register(ced, 1, 2, 0xffffffff);
312 312 }
313 313  
314   -static int __devinit em_sti_probe(struct platform_device *pdev)
  314 +static int em_sti_probe(struct platform_device *pdev)
315 315 {
316 316 struct em_sti_priv *p;
317 317 struct resource *res;
318 318  
... ... @@ -379,12 +379,12 @@
379 379 return ret;
380 380 }
381 381  
382   -static int __devexit em_sti_remove(struct platform_device *pdev)
  382 +static int em_sti_remove(struct platform_device *pdev)
383 383 {
384 384 return -EBUSY; /* cannot unregister clockevent and clocksource */
385 385 }
386 386  
387   -static const struct of_device_id em_sti_dt_ids[] __devinitconst = {
  387 +static const struct of_device_id em_sti_dt_ids[] = {
388 388 { .compatible = "renesas,em-sti", },
389 389 {},
390 390 };
... ... @@ -392,7 +392,7 @@
392 392  
393 393 static struct platform_driver em_sti_device_driver = {
394 394 .probe = em_sti_probe,
395   - .remove = __devexit_p(em_sti_remove),
  395 + .remove = em_sti_remove,
396 396 .driver = {
397 397 .name = "em_sti",
398 398 .of_match_table = em_sti_dt_ids,
drivers/clocksource/sh_cmt.c
Diff comments   View file @ 1850514
... ... @@ -726,7 +726,7 @@
726 726 return ret;
727 727 }
728 728  
729   -static int __devinit sh_cmt_probe(struct platform_device *pdev)
  729 +static int sh_cmt_probe(struct platform_device *pdev)
730 730 {
731 731 struct sh_cmt_priv *p = platform_get_drvdata(pdev);
732 732 struct sh_timer_config *cfg = pdev->dev.platform_data;
733 733  
... ... @@ -767,14 +767,14 @@
767 767 return 0;
768 768 }
769 769  
770   -static int __devexit sh_cmt_remove(struct platform_device *pdev)
  770 +static int sh_cmt_remove(struct platform_device *pdev)
771 771 {
772 772 return -EBUSY; /* cannot unregister clockevent and clocksource */
773 773 }
774 774  
775 775 static struct platform_driver sh_cmt_device_driver = {
776 776 .probe = sh_cmt_probe,
777   - .remove = __devexit_p(sh_cmt_remove),
  777 + .remove = sh_cmt_remove,
778 778 .driver = {
779 779 .name = "sh_cmt",
780 780 }
drivers/clocksource/sh_mtu2.c
Diff comments   View file @ 1850514
... ... @@ -321,7 +321,7 @@
321 321 return ret;
322 322 }
323 323  
324   -static int __devinit sh_mtu2_probe(struct platform_device *pdev)
  324 +static int sh_mtu2_probe(struct platform_device *pdev)
325 325 {
326 326 struct sh_mtu2_priv *p = platform_get_drvdata(pdev);
327 327 struct sh_timer_config *cfg = pdev->dev.platform_data;
328 328  
... ... @@ -362,14 +362,14 @@
362 362 return 0;
363 363 }
364 364  
365   -static int __devexit sh_mtu2_remove(struct platform_device *pdev)
  365 +static int sh_mtu2_remove(struct platform_device *pdev)
366 366 {
367 367 return -EBUSY; /* cannot unregister clockevent */
368 368 }
369 369  
370 370 static struct platform_driver sh_mtu2_device_driver = {
371 371 .probe = sh_mtu2_probe,
372   - .remove = __devexit_p(sh_mtu2_remove),
  372 + .remove = sh_mtu2_remove,
373 373 .driver = {
374 374 .name = "sh_mtu2",
375 375 }
drivers/clocksource/sh_tmu.c
Diff comments   View file @ 1850514
... ... @@ -484,7 +484,7 @@
484 484 return ret;
485 485 }
486 486  
487   -static int __devinit sh_tmu_probe(struct platform_device *pdev)
  487 +static int sh_tmu_probe(struct platform_device *pdev)
488 488 {
489 489 struct sh_tmu_priv *p = platform_get_drvdata(pdev);
490 490 struct sh_timer_config *cfg = pdev->dev.platform_data;
491 491  
... ... @@ -525,14 +525,14 @@
525 525 return 0;
526 526 }
527 527  
528   -static int __devexit sh_tmu_remove(struct platform_device *pdev)
  528 +static int sh_tmu_remove(struct platform_device *pdev)
529 529 {
530 530 return -EBUSY; /* cannot unregister clockevent and clocksource */
531 531 }
532 532  
533 533 static struct platform_driver sh_tmu_device_driver = {
534 534 .probe = sh_tmu_probe,
535   - .remove = __devexit_p(sh_tmu_remove),
  535 + .remove = sh_tmu_remove,
536 536 .driver = {
537 537 .name = "sh_tmu",
538 538 }