From 64ff422a7588ef375fb089be2de1c07a48ede103 Mon Sep 17 00:00:00 2001 From: Franky Lin Date: Thu, 10 Nov 2011 20:30:33 +0100 Subject: [PATCH] --- yaml --- r: 277887 b: refs/heads/master c: 99b72cde632b67603f4c7f18e8ff23a57b484478 h: refs/heads/master i: 277885: 0726c92e2f26352919ebb353f428e1e5b7dd3b20 277883: 935616afd9c2044d8d35e337883b3882cb995fad 277879: 17ecc2d164f8fcf8ea8538a3bb4736faf49c845c 277871: 21e5d6299f374248a53bff4c12e7adb189514d40 277855: 192d7d9362423059252dc15db4bb8b89e02eb37e 277823: b7b99255425bc1b85001d16e82a5c30d4f35a3c4 277759: fc39efcb18cbec5b99728e8beff4508b58d47726 v: v3 --- [refs] | 2 +- .../net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/[refs] b/[refs] index 1c2618acc2fa..13694c5c25c2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 046808daf9f6b8c5275861330d4f8c2e6cfe3c31 +refs/heads/master: 99b72cde632b67603f4c7f18e8ff23a57b484478 diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c index d8a521ae45da..22913af26db8 100644 --- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c +++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c @@ -687,14 +687,6 @@ static int brcmf_sdbrcm_htclk(struct brcmf_bus *bus, bool on, bool pendok) return -EBADE; } - if (pendok && ((bus->ci->c_inf[1].id == PCMCIA_CORE_ID) - && (bus->ci->c_inf[1].rev == 9))) { - u32 dummy, retries; - r_sdreg32(bus, &dummy, - offsetof(struct sdpcmd_regs, clockctlstatus), - &retries); - } - /* Check current status */ clkctl = brcmf_sdcard_cfg_read(bus->sdiodev, SDIO_FUNC_1, SBSDIO_FUNC1_CHIPCLKCSR, &err); @@ -911,13 +903,6 @@ static int brcmf_sdbrcm_bussleep(struct brcmf_bus *bus, bool sleep) brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_1, SBSDIO_FUNC1_CHIPCLKCSR, 0, NULL); - /* Force pad isolation off if possible - (in case power never toggled) */ - if ((bus->ci->c_inf[1].id == PCMCIA_CORE_ID) - && (bus->ci->c_inf[1].rev >= 10)) - brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_1, - SBSDIO_DEVICE_CTL, 0, NULL); - /* Make sure the controller has the bus up */ brcmf_sdbrcm_clkctl(bus, CLK_AVAIL, false);