bcma: use standard bus scanning during early register

[deliverable/linux.git] / drivers / bcma / scan.c

diff --git a/drivers/bcma/scan.c b/drivers/bcma/scan.c
index 5328ee5b4df05547a26be8125eab785e6cb91eb0..df806b9c549084fab8e61569718b2441485f17e4 100644 (file)
--- a/drivers/bcma/scan.c
+++ b/drivers/bcma/scan.c
@@ -461,6 +461,10 @@ int bcma_bus_scan(struct bcma_bus *bus)
 
        int err, core_num = 0;
 
+       /* Skip if bus was already scanned (e.g. during early register) */
+       if (bus->nr_cores)
+               return 0;
+
        erombase = bcma_scan_read32(bus, 0, BCMA_CC_EROM);
        if (bus->hosttype == BCMA_HOSTTYPE_SOC) {
                eromptr = ioremap_nocache(erombase, BCMA_CORE_SIZE);
@@ -519,61 +523,3 @@ out:
 
        return err;
 }
-
-int __init bcma_bus_scan_early(struct bcma_bus *bus,
-                              struct bcma_device_id *match,
-                              struct bcma_device *core)
-{
-       u32 erombase;
-       u32 __iomem *eromptr, *eromend;
-
-       int err = -ENODEV;
-       int core_num = 0;
-
-       erombase = bcma_scan_read32(bus, 0, BCMA_CC_EROM);
-       if (bus->hosttype == BCMA_HOSTTYPE_SOC) {
-               eromptr = ioremap_nocache(erombase, BCMA_CORE_SIZE);
-               if (!eromptr)
-                       return -ENOMEM;
-       } else {
-               eromptr = bus->mmio;
-       }
-
-       eromend = eromptr + BCMA_CORE_SIZE / sizeof(u32);
-
-       bcma_scan_switch_core(bus, erombase);
-
-       while (eromptr < eromend) {
-               memset(core, 0, sizeof(*core));
-               INIT_LIST_HEAD(&core->list);
-               core->bus = bus;
-
-               err = bcma_get_next_core(bus, &eromptr, match, core_num, core);
-               if (err == -ENODEV) {
-                       core_num++;
-                       continue;
-               } else if (err == -ENXIO)
-                       continue;
-               else if (err == -ESPIPE)
-                       break;
-               else if (err < 0)
-                       goto out;
-
-               core->core_index = core_num++;
-               bus->nr_cores++;
-               bcma_info(bus, "Core %d found: %s (manuf 0x%03X, id 0x%03X, rev 0x%02X, class 0x%X)\n",
-                         core->core_index, bcma_device_name(&core->id),
-                         core->id.manuf, core->id.id, core->id.rev,
-                         core->id.class);
-
-               list_add_tail(&core->list, &bus->cores);
-               err = 0;
-               break;
-       }
-
-out:
-       if (bus->hosttype == BCMA_HOSTTYPE_SOC)
-               iounmap(eromptr);
-
-       return err;
-}