bcma: use separated function to initialize bus on SoC

This is required to split SoC bus init into two phases. The later one
(which includes scanning) should be called when kalloc is available.

Cc: Ralf Baechle <[email protected]>
Signed-off-by: Rafał Miłecki <[email protected]>
Acked-by: Hauke Mehrtens <[email protected]>
Signed-off-by: John W. Linville <[email protected]>

diff --git a/arch/mips/bcm47xx/setup.c b/arch/mips/bcm47xx/setup.c
index 2b63e7e7d3d35d4414b28cfcecfeacdfed03e458..fff6ed4978c7422b42a6cc2fcd02e08710f5cd5c 100644 (file)
--- a/arch/mips/bcm47xx/setup.c
+++ b/arch/mips/bcm47xx/setup.c
@@ -201,6 +201,10 @@ static void __init bcm47xx_register_bcma(void)
                pr_warn("bcm47xx: someone else already registered a bcma SPROM callback handler (err %d)\n", err);
 
        err = bcma_host_soc_register(&bcm47xx_bus.bcma);
+       if (err)
+               panic("Failed to register BCMA bus (err %d)", err);
+
+       err = bcma_host_soc_init(&bcm47xx_bus.bcma);
        if (err)
                panic("Failed to initialize BCMA bus (err %d)", err);
 

diff --git a/drivers/bcma/host_soc.c b/drivers/bcma/host_soc.c
index 379e0d4ebe720f9534c2dd495fc84c1ced942ed6..718e054dd7278624019c57d9c265d0f4420f545b 100644 (file)
--- a/drivers/bcma/host_soc.c
+++ b/drivers/bcma/host_soc.c
@@ -165,7 +165,6 @@ static const struct bcma_host_ops bcma_host_soc_ops = {
 int __init bcma_host_soc_register(struct bcma_soc *soc)
 {
        struct bcma_bus *bus = &soc->bus;
-       int err;
 
        /* iomap only first core. We have to read some register on this core
         * to scan the bus.
@@ -181,7 +180,15 @@ int __init bcma_host_soc_register(struct bcma_soc *soc)
        /* Initialize struct, detect chip */
        bcma_init_bus(bus);
 
-       /* Register */
+       return 0;
+}
+
+int __init bcma_host_soc_init(struct bcma_soc *soc)
+{
+       struct bcma_bus *bus = &soc->bus;
+       int err;
+
+       /* Scan bus and initialize it */
        err = bcma_bus_early_register(bus, &soc->core_cc, &soc->core_mips);
        if (err)
                iounmap(bus->mmio);

diff --git a/include/linux/bcma/bcma_soc.h b/include/linux/bcma/bcma_soc.h
index 4203c5593b9f99f638eda35ad25ca161365c249b..f24d245f83948157092816175d872f360356ad48 100644 (file)
--- a/include/linux/bcma/bcma_soc.h
+++ b/include/linux/bcma/bcma_soc.h
@@ -10,6 +10,7 @@ struct bcma_soc {
 };
 
 int __init bcma_host_soc_register(struct bcma_soc *soc);
+int __init bcma_host_soc_init(struct bcma_soc *soc);
 
 int bcma_bus_register(struct bcma_bus *bus);