aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFranky Lin <frankyl@broadcom.com>2011-11-10 14:30:25 -0500
committerJohn W. Linville <linville@tuxdriver.com>2011-11-11 14:28:38 -0500
commit122d36fd5ac99305d294012044198894648bf0f8 (patch)
treebfb7697f4031d9946f46d6f27abeb5df7408d8ee
parentd77e70ff5ace175f19447a1965691a794c27de24 (diff)
brcm80211: fmac: remove id retrieve code
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>
-rw-r--r--drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
index cef9abb40a5..f6b1822031f 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
@@ -474,8 +474,6 @@ static void
474brcmf_sdio_chip_buscoresetup(struct brcmf_sdio_dev *sdiodev, 474brcmf_sdio_chip_buscoresetup(struct brcmf_sdio_dev *sdiodev,
475 struct chip_info *ci) 475 struct chip_info *ci)
476{ 476{
477 u32 regdata;
478
479 /* get chipcommon rev */ 477 /* get chipcommon rev */
480 ci->c_inf[0].rev = ci->corerev(sdiodev, ci, ci->c_inf[0].id); 478 ci->c_inf[0].rev = ci->corerev(sdiodev, ci, ci->c_inf[0].id);
481 479
@@ -492,9 +490,6 @@ brcmf_sdio_chip_buscoresetup(struct brcmf_sdio_dev *sdiodev,
492 } 490 }
493 491
494 ci->c_inf[1].rev = ci->corerev(sdiodev, ci, ci->c_inf[1].id); 492 ci->c_inf[1].rev = ci->corerev(sdiodev, ci, ci->c_inf[1].id);
495 regdata = brcmf_sdcard_reg_read(sdiodev,
496 CORE_SB(ci->c_inf[1].base, sbidhigh), 4);
497 ci->c_inf[1].id = (regdata & SSB_IDHIGH_CC) >> SSB_IDHIGH_CC_SHIFT;
498 493
499 brcmf_dbg(INFO, "ccrev=%d, pmurev=%d, buscore rev/type=%d/0x%x\n", 494 brcmf_dbg(INFO, "ccrev=%d, pmurev=%d, buscore rev/type=%d/0x%x\n",
500 ci->c_inf[0].rev, ci->pmurev, 495 ci->c_inf[0].rev, ci->pmurev,