brcm80211: fmac: remove id retrieve code
authorFranky Lin <frankyl@broadcom.com>
Thu, 10 Nov 2011 19:30:25 +0000 (20:30 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 11 Nov 2011 19:28:38 +0000 (14:28 -0500)
sdio_chip.c is dedicated to sdio bus chip. No need to retrieve id
for bus core

Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c

index cef9abb..f6b1822 100644 (file)
@@ -474,8 +474,6 @@ static void
 brcmf_sdio_chip_buscoresetup(struct brcmf_sdio_dev *sdiodev,
                             struct chip_info *ci)
 {
-       u32 regdata;
-
        /* get chipcommon rev */
        ci->c_inf[0].rev = ci->corerev(sdiodev, ci, ci->c_inf[0].id);
 
@@ -492,9 +490,6 @@ brcmf_sdio_chip_buscoresetup(struct brcmf_sdio_dev *sdiodev,
        }
 
        ci->c_inf[1].rev = ci->corerev(sdiodev, ci, ci->c_inf[1].id);
-       regdata = brcmf_sdcard_reg_read(sdiodev,
-                               CORE_SB(ci->c_inf[1].base, sbidhigh), 4);
-       ci->c_inf[1].id = (regdata & SSB_IDHIGH_CC) >> SSB_IDHIGH_CC_SHIFT;
 
        brcmf_dbg(INFO, "ccrev=%d, pmurev=%d, buscore rev/type=%d/0x%x\n",
                  ci->c_inf[0].rev, ci->pmurev,