Merge tag 'dt-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux-2.6-microblaze.git] / drivers / bcma / scan.c

diff --git a/drivers/bcma/scan.c b/drivers/bcma/scan.c
index d49e7c0..26d12a7 100644 (file)
--- a/drivers/bcma/scan.c
+++ b/drivers/bcma/scan.c
@@ -141,8 +141,7 @@ static const char *bcma_device_name(const struct bcma_device_id *id)
        return "UNKNOWN";
 }
 
-static u32 bcma_scan_read32(struct bcma_bus *bus, u8 current_coreidx,
-                      u16 offset)
+static u32 bcma_scan_read32(struct bcma_bus *bus, u16 offset)
 {
        return readl(bus->mmio + offset);
 }
@@ -443,7 +442,7 @@ void bcma_detect_chip(struct bcma_bus *bus)
 
        bcma_scan_switch_core(bus, BCMA_ADDR_BASE);
 
-       tmp = bcma_scan_read32(bus, 0, BCMA_CC_ID);
+       tmp = bcma_scan_read32(bus, BCMA_CC_ID);
        chipinfo->id = (tmp & BCMA_CC_ID_ID) >> BCMA_CC_ID_ID_SHIFT;
        chipinfo->rev = (tmp & BCMA_CC_ID_REV) >> BCMA_CC_ID_REV_SHIFT;
        chipinfo->pkg = (tmp & BCMA_CC_ID_PKG) >> BCMA_CC_ID_PKG_SHIFT;
@@ -465,7 +464,7 @@ int bcma_bus_scan(struct bcma_bus *bus)
        if (bus->nr_cores)
                return 0;
 
-       erombase = bcma_scan_read32(bus, 0, BCMA_CC_EROM);
+       erombase = bcma_scan_read32(bus, BCMA_CC_EROM);
        if (bus->hosttype == BCMA_HOSTTYPE_SOC) {
                eromptr = ioremap(erombase, BCMA_CORE_SIZE);
                if (!eromptr)