diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2011-06-21 14:57:16 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-06-22 16:09:58 -0400 |
commit | cd15598707aff52da4302d9b6a3fc878bca27383 (patch) | |
tree | ecf5e01003366373cc4873e56d6ef72fd2592ba3 /drivers/ssb/main.c | |
parent | 999a7a88f1b062af5617fa55df317446af86a3da (diff) |
ssb: add __devinit to some functions
Two functions in ssb are using register_pci_controller() which is
__devinit. The functions ssb_pcicore_init_hostmode() and
ssb_gige_probe() should also be __devinit.
This fixes the following warning:
WARNING: vmlinux.o(.text+0x2727b8): Section mismatch in reference from the function ssb_pcicore_init_hostmode() to the function .devinit.text:register_pci_controller()
The function ssb_pcicore_init_hostmode() references
the function __devinit register_pci_controller().
This is often because ssb_pcicore_init_hostmode lacks a __devinit
annotation or the annotation of register_pci_controller is wrong.
WARNING: vmlinux.o(.text+0x273398): Section mismatch in reference from the function ssb_gige_probe() to the function .devinit.text:register_pci_controller()
The function ssb_gige_probe() references
the function __devinit register_pci_controller().
This is often because ssb_gige_probe lacks a __devinit
annotation or the annotation of register_pci_controller is wrong.
Reported-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/ssb/main.c')
-rw-r--r-- | drivers/ssb/main.c | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c index f8a13f863217..e568664f8b9c 100644 --- a/drivers/ssb/main.c +++ b/drivers/ssb/main.c | |||
@@ -557,7 +557,7 @@ error: | |||
557 | } | 557 | } |
558 | 558 | ||
559 | /* Needs ssb_buses_lock() */ | 559 | /* Needs ssb_buses_lock() */ |
560 | static int ssb_attach_queued_buses(void) | 560 | static int __devinit ssb_attach_queued_buses(void) |
561 | { | 561 | { |
562 | struct ssb_bus *bus, *n; | 562 | struct ssb_bus *bus, *n; |
563 | int err = 0; | 563 | int err = 0; |
@@ -768,9 +768,9 @@ out: | |||
768 | return err; | 768 | return err; |
769 | } | 769 | } |
770 | 770 | ||
771 | static int ssb_bus_register(struct ssb_bus *bus, | 771 | static int __devinit ssb_bus_register(struct ssb_bus *bus, |
772 | ssb_invariants_func_t get_invariants, | 772 | ssb_invariants_func_t get_invariants, |
773 | unsigned long baseaddr) | 773 | unsigned long baseaddr) |
774 | { | 774 | { |
775 | int err; | 775 | int err; |
776 | 776 | ||
@@ -851,8 +851,8 @@ err_disable_xtal: | |||
851 | } | 851 | } |
852 | 852 | ||
853 | #ifdef CONFIG_SSB_PCIHOST | 853 | #ifdef CONFIG_SSB_PCIHOST |
854 | int ssb_bus_pcibus_register(struct ssb_bus *bus, | 854 | int __devinit ssb_bus_pcibus_register(struct ssb_bus *bus, |
855 | struct pci_dev *host_pci) | 855 | struct pci_dev *host_pci) |
856 | { | 856 | { |
857 | int err; | 857 | int err; |
858 | 858 | ||
@@ -875,9 +875,9 @@ EXPORT_SYMBOL(ssb_bus_pcibus_register); | |||
875 | #endif /* CONFIG_SSB_PCIHOST */ | 875 | #endif /* CONFIG_SSB_PCIHOST */ |
876 | 876 | ||
877 | #ifdef CONFIG_SSB_PCMCIAHOST | 877 | #ifdef CONFIG_SSB_PCMCIAHOST |
878 | int ssb_bus_pcmciabus_register(struct ssb_bus *bus, | 878 | int __devinit ssb_bus_pcmciabus_register(struct ssb_bus *bus, |
879 | struct pcmcia_device *pcmcia_dev, | 879 | struct pcmcia_device *pcmcia_dev, |
880 | unsigned long baseaddr) | 880 | unsigned long baseaddr) |
881 | { | 881 | { |
882 | int err; | 882 | int err; |
883 | 883 | ||
@@ -897,8 +897,9 @@ EXPORT_SYMBOL(ssb_bus_pcmciabus_register); | |||
897 | #endif /* CONFIG_SSB_PCMCIAHOST */ | 897 | #endif /* CONFIG_SSB_PCMCIAHOST */ |
898 | 898 | ||
899 | #ifdef CONFIG_SSB_SDIOHOST | 899 | #ifdef CONFIG_SSB_SDIOHOST |
900 | int ssb_bus_sdiobus_register(struct ssb_bus *bus, struct sdio_func *func, | 900 | int __devinit ssb_bus_sdiobus_register(struct ssb_bus *bus, |
901 | unsigned int quirks) | 901 | struct sdio_func *func, |
902 | unsigned int quirks) | ||
902 | { | 903 | { |
903 | int err; | 904 | int err; |
904 | 905 | ||
@@ -918,9 +919,9 @@ int ssb_bus_sdiobus_register(struct ssb_bus *bus, struct sdio_func *func, | |||
918 | EXPORT_SYMBOL(ssb_bus_sdiobus_register); | 919 | EXPORT_SYMBOL(ssb_bus_sdiobus_register); |
919 | #endif /* CONFIG_SSB_PCMCIAHOST */ | 920 | #endif /* CONFIG_SSB_PCMCIAHOST */ |
920 | 921 | ||
921 | int ssb_bus_ssbbus_register(struct ssb_bus *bus, | 922 | int __devinit ssb_bus_ssbbus_register(struct ssb_bus *bus, |
922 | unsigned long baseaddr, | 923 | unsigned long baseaddr, |
923 | ssb_invariants_func_t get_invariants) | 924 | ssb_invariants_func_t get_invariants) |
924 | { | 925 | { |
925 | int err; | 926 | int err; |
926 | 927 | ||