Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit ba66ddfa613886cbb554f7b064dc05bdc2c7138b

Authored by Sam Ravnborg
Committed by Linus Torvalds
1 parent ed49f5d001
Exists in master and in 7 other branches imx_3.0.35_4.1.0, 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, smarc-l5.0.0_1.0.0-ga

pcmcia: silence section mismatch warnings from pci_driver variables 

Silence following warnings:
WARNING: drivers/pcmcia/built-in.o(.data+0x14e0): Section mismatch in reference from the variable pd6729_pci_drv to the function .devinit.text:pd6729_pci_probe()
WARNING: drivers/pcmcia/built-in.o(.data+0x14e8): Section mismatch in reference from the variable pd6729_pci_drv to the function .devexit.text:pd6729_pci_remove()
WARNING: drivers/pcmcia/built-in.o(.data+0x16c0): Section mismatch in reference from the variable i82092aa_pci_drv to the function .devinit.text:i82092aa_pci_probe()
WARNING: drivers/pcmcia/built-in.o(.data+0x16c8): Section mismatch in reference from the variable i82092aa_pci_drv to the function .devexit.text:i82092aa_pci_remove()

Rename the variables from *_drv to *_driver so modpost ignore the OK
references to __devinit/__devexit functions.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 2 changed files with 6 additions and 6 deletions Side-by-side Diff

drivers/pcmcia/i82092.c
Diff comments   View file @ ba66ddf
... ... @@ -53,7 +53,7 @@
53 53 }
54 54 #endif
55 55  
56   -static struct pci_driver i82092aa_pci_drv = {
  56 +static struct pci_driver i82092aa_pci_driver = {
57 57 .name = "i82092aa",
58 58 .id_table = i82092aa_pci_ids,
59 59 .probe = i82092aa_pci_probe,
60 60  
... ... @@ -714,13 +714,13 @@
714 714  
715 715 static int i82092aa_module_init(void)
716 716 {
717   - return pci_register_driver(&i82092aa_pci_drv);
  717 + return pci_register_driver(&i82092aa_pci_driver);
718 718 }
719 719  
720 720 static void i82092aa_module_exit(void)
721 721 {
722 722 enter("i82092aa_module_exit");
723   - pci_unregister_driver(&i82092aa_pci_drv);
  723 + pci_unregister_driver(&i82092aa_pci_driver);
724 724 if (sockets[0].io_base>0)
725 725 release_region(sockets[0].io_base, 2);
726 726 leave("i82092aa_module_exit");
drivers/pcmcia/pd6729.c
Diff comments   View file @ ba66ddf
... ... @@ -778,7 +778,7 @@
778 778 };
779 779 MODULE_DEVICE_TABLE(pci, pd6729_pci_ids);
780 780  
781   -static struct pci_driver pd6729_pci_drv = {
  781 +static struct pci_driver pd6729_pci_driver = {
782 782 .name = "pd6729",
783 783 .id_table = pd6729_pci_ids,
784 784 .probe = pd6729_pci_probe,
785 785  
... ... @@ -791,12 +791,12 @@
791 791  
792 792 static int pd6729_module_init(void)
793 793 {
794   - return pci_register_driver(&pd6729_pci_drv);
  794 + return pci_register_driver(&pd6729_pci_driver);
795 795 }
796 796  
797 797 static void pd6729_module_exit(void)
798 798 {
799   - pci_unregister_driver(&pd6729_pci_drv);
  799 + pci_unregister_driver(&pd6729_pci_driver);
800 800 }
801 801  
802 802 module_init(pd6729_module_init);