Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

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

diff --git a/drivers/bcma/scan.c b/drivers/bcma/scan.c
index fd546c51b076ad93c03a0f32ad37ee83b4a7434b..1a942f7341887e730052dca1f9b50376fc4ae9d8 100644 (file)
--- a/drivers/bcma/scan.c
+++ b/drivers/bcma/scan.c
@@ -219,7 +219,7 @@ static s32 bcma_erom_get_mst_port(struct bcma_bus *bus, u32 __iomem **eromptr)
 static u32 bcma_erom_get_addr_desc(struct bcma_bus *bus, u32 __iomem **eromptr,
                                  u32 type, u8 port)
 {
-       u32 addrl, addrh, sizel, sizeh = 0;
+       u32 addrl, addrh, sizeh = 0;
        u32 size;
 
        u32 ent = bcma_erom_get_ent(bus, eromptr);
@@ -239,12 +239,9 @@ static u32 bcma_erom_get_addr_desc(struct bcma_bus *bus, u32 __iomem **eromptr,
 
        if ((ent & SCAN_ADDR_SZ) == SCAN_ADDR_SZ_SZD) {
                size = bcma_erom_get_ent(bus, eromptr);
-               sizel = size & SCAN_SIZE_SZ;
                if (size & SCAN_SIZE_SG32)
                        sizeh = bcma_erom_get_ent(bus, eromptr);
-       } else
-               sizel = SCAN_ADDR_SZ_BASE <<
-                               ((ent & SCAN_ADDR_SZ) >> SCAN_ADDR_SZ_SHIFT);
+       }
 
        return addrl;
 }