projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
ssb
/
main.c
diff --git
a/drivers/ssb/main.c
b/drivers/ssb/main.c
index c82c5c95fe85022180971af93139b8fc33416c50..772ad9b5c304fc986b459c4f4c6c5513e70ecd16 100644
(file)
--- a/
drivers/ssb/main.c
+++ b/
drivers/ssb/main.c
@@
-548,7
+548,7
@@
error:
}
/* Needs ssb_buses_lock() */
}
/* 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;
{
struct ssb_bus *bus, *n;
int err = 0;
@@
-761,9
+761,9
@@
out:
return err;
}
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;
{
int err;
@@
-851,8
+851,7
@@
err_disable_xtal:
}
#ifdef CONFIG_SSB_PCIHOST
}
#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;
{
int err;
@@
-875,9
+874,9
@@
EXPORT_SYMBOL(ssb_bus_pcibus_register);
#endif /* CONFIG_SSB_PCIHOST */
#ifdef CONFIG_SSB_PCMCIAHOST
#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;
{
int err;
@@
-897,9
+896,8
@@
EXPORT_SYMBOL(ssb_bus_pcmciabus_register);
#endif /* CONFIG_SSB_PCMCIAHOST */
#ifdef CONFIG_SSB_SDIOHOST
#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;
{
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 */
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;
{
int err;