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 c82c5c95fe8..772ad9b5c30 100644 --- a/drivers/ssb/main.c +++ b/drivers/ssb/main.c @@ -548,7 +548,7 @@ error:  }  /* Needs ssb_buses_lock() */ -static int __devinit ssb_attach_queued_buses(void) +static int ssb_attach_queued_buses(void)  {  	struct ssb_bus *bus, *n;  	int err = 0; @@ -761,9 +761,9 @@ out:  	return err;  } -static int __devinit ssb_bus_register(struct ssb_bus *bus, -				      ssb_invariants_func_t get_invariants, -				      unsigned long baseaddr) +static int ssb_bus_register(struct ssb_bus *bus, +			    ssb_invariants_func_t get_invariants, +			    unsigned long baseaddr)  {  	int err; @@ -851,8 +851,7 @@ err_disable_xtal:  }  #ifdef CONFIG_SSB_PCIHOST -int __devinit ssb_bus_pcibus_register(struct ssb_bus *bus, -				      struct pci_dev *host_pci) +int ssb_bus_pcibus_register(struct ssb_bus *bus, struct pci_dev *host_pci)  {  	int err; @@ -875,9 +874,9 @@ EXPORT_SYMBOL(ssb_bus_pcibus_register);  #endif /* CONFIG_SSB_PCIHOST */  #ifdef CONFIG_SSB_PCMCIAHOST -int __devinit ssb_bus_pcmciabus_register(struct ssb_bus *bus, -					 struct pcmcia_device *pcmcia_dev, -					 unsigned long baseaddr) +int ssb_bus_pcmciabus_register(struct ssb_bus *bus, +			       struct pcmcia_device *pcmcia_dev, +			       unsigned long baseaddr)  {  	int err; @@ -897,9 +896,8 @@ EXPORT_SYMBOL(ssb_bus_pcmciabus_register);  #endif /* CONFIG_SSB_PCMCIAHOST */  #ifdef CONFIG_SSB_SDIOHOST -int __devinit ssb_bus_sdiobus_register(struct ssb_bus *bus, -				       struct sdio_func *func, -				       unsigned int quirks) +int ssb_bus_sdiobus_register(struct ssb_bus *bus, struct sdio_func *func, +			     unsigned int quirks)  {  	int err; @@ -919,9 +917,8 @@ int __devinit ssb_bus_sdiobus_register(struct ssb_bus *bus,  EXPORT_SYMBOL(ssb_bus_sdiobus_register);  #endif /* CONFIG_SSB_PCMCIAHOST */ -int __devinit ssb_bus_ssbbus_register(struct ssb_bus *bus, -				      unsigned long baseaddr, -				      ssb_invariants_func_t get_invariants) +int ssb_bus_ssbbus_register(struct ssb_bus *bus, unsigned long baseaddr, +			    ssb_invariants_func_t get_invariants)  {  	int err;  |