diff options
Diffstat (limited to 'drivers/ssb/main.c')
-rw-r--r-- | drivers/ssb/main.c | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c index c82c5c95fe85..772ad9b5c304 100644 --- a/drivers/ssb/main.c +++ b/drivers/ssb/main.c | |||
@@ -548,7 +548,7 @@ error: | |||
548 | } | 548 | } |
549 | 549 | ||
550 | /* Needs ssb_buses_lock() */ | 550 | /* Needs ssb_buses_lock() */ |
551 | static int __devinit ssb_attach_queued_buses(void) | 551 | static int ssb_attach_queued_buses(void) |
552 | { | 552 | { |
553 | struct ssb_bus *bus, *n; | 553 | struct ssb_bus *bus, *n; |
554 | int err = 0; | 554 | int err = 0; |
@@ -761,9 +761,9 @@ out: | |||
761 | return err; | 761 | return err; |
762 | } | 762 | } |
763 | 763 | ||
764 | static int __devinit ssb_bus_register(struct ssb_bus *bus, | 764 | static int ssb_bus_register(struct ssb_bus *bus, |
765 | ssb_invariants_func_t get_invariants, | 765 | ssb_invariants_func_t get_invariants, |
766 | unsigned long baseaddr) | 766 | unsigned long baseaddr) |
767 | { | 767 | { |
768 | int err; | 768 | int err; |
769 | 769 | ||
@@ -851,8 +851,7 @@ err_disable_xtal: | |||
851 | } | 851 | } |
852 | 852 | ||
853 | #ifdef CONFIG_SSB_PCIHOST | 853 | #ifdef CONFIG_SSB_PCIHOST |
854 | int __devinit ssb_bus_pcibus_register(struct ssb_bus *bus, | 854 | int ssb_bus_pcibus_register(struct ssb_bus *bus, struct pci_dev *host_pci) |
855 | struct pci_dev *host_pci) | ||
856 | { | 855 | { |
857 | int err; | 856 | int err; |
858 | 857 | ||
@@ -875,9 +874,9 @@ EXPORT_SYMBOL(ssb_bus_pcibus_register); | |||
875 | #endif /* CONFIG_SSB_PCIHOST */ | 874 | #endif /* CONFIG_SSB_PCIHOST */ |
876 | 875 | ||
877 | #ifdef CONFIG_SSB_PCMCIAHOST | 876 | #ifdef CONFIG_SSB_PCMCIAHOST |
878 | int __devinit ssb_bus_pcmciabus_register(struct ssb_bus *bus, | 877 | int ssb_bus_pcmciabus_register(struct ssb_bus *bus, |
879 | struct pcmcia_device *pcmcia_dev, | 878 | struct pcmcia_device *pcmcia_dev, |
880 | unsigned long baseaddr) | 879 | unsigned long baseaddr) |
881 | { | 880 | { |
882 | int err; | 881 | int err; |
883 | 882 | ||
@@ -897,9 +896,8 @@ EXPORT_SYMBOL(ssb_bus_pcmciabus_register); | |||
897 | #endif /* CONFIG_SSB_PCMCIAHOST */ | 896 | #endif /* CONFIG_SSB_PCMCIAHOST */ |
898 | 897 | ||
899 | #ifdef CONFIG_SSB_SDIOHOST | 898 | #ifdef CONFIG_SSB_SDIOHOST |
900 | int __devinit ssb_bus_sdiobus_register(struct ssb_bus *bus, | 899 | int ssb_bus_sdiobus_register(struct ssb_bus *bus, struct sdio_func *func, |
901 | struct sdio_func *func, | 900 | unsigned int quirks) |
902 | unsigned int quirks) | ||
903 | { | 901 | { |
904 | int err; | 902 | int err; |
905 | 903 | ||
@@ -919,9 +917,8 @@ int __devinit ssb_bus_sdiobus_register(struct ssb_bus *bus, | |||
919 | EXPORT_SYMBOL(ssb_bus_sdiobus_register); | 917 | EXPORT_SYMBOL(ssb_bus_sdiobus_register); |
920 | #endif /* CONFIG_SSB_PCMCIAHOST */ | 918 | #endif /* CONFIG_SSB_PCMCIAHOST */ |
921 | 919 | ||
922 | int __devinit ssb_bus_ssbbus_register(struct ssb_bus *bus, | 920 | int ssb_bus_ssbbus_register(struct ssb_bus *bus, unsigned long baseaddr, |
923 | unsigned long baseaddr, | 921 | ssb_invariants_func_t get_invariants) |
924 | ssb_invariants_func_t get_invariants) | ||
925 | { | 922 | { |
926 | int err; | 923 | int err; |
927 | 924 | ||