Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f6c195b authored by Hante Meuleman's avatar Hante Meuleman Committed by John W. Linville
Browse files

brcmfmac: Remove immediate sleep support from SDIO. 



Immediate sleep support is an aggressive power saving option
that has not been enabled in brcmfmac and is removed to
simplify code.

Reviewed-by: default avatarArend Van Spriel <arend@broadcom.com>
Reviewed-by: default avatarFranky (Zhenhui) Lin <frankyl@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarDaniel (Deognyoun) Kim <dekim@broadcom.com>
Signed-off-by: default avatarHante Meuleman <meuleman@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 71abdc00

drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c

+0 −20
Original line number Original line Diff line number Diff line
@@ -304,7 +304,6 @@ struct rte_console { 
/* Flags for SDH calls */

/* Flags for SDH calls */

#define F2SYNC	(SDIO_REQ_4BYTE | SDIO_REQ_FIXED)

#define F2SYNC	(SDIO_REQ_4BYTE | SDIO_REQ_FIXED)





#define BRCMF_IDLE_IMMEDIATE	(-1)	/* Enter idle immediately */

#define BRCMF_IDLE_ACTIVE	0	/* Do not request any SD clock change

#define BRCMF_IDLE_ACTIVE	0	/* Do not request any SD clock change

					 * when idle

					 * when idle

					 */

					 */
@@ -2662,16 +2661,6 @@ static void brcmf_sdio_dpc(struct brcmf_sdio *bus) 
		    data_ok(bus)) || PKT_AVAILABLE()) {

		    data_ok(bus)) || PKT_AVAILABLE()) {

		atomic_inc(&bus->dpc_tskcnt);

		atomic_inc(&bus->dpc_tskcnt);

	}

	}



	/* If we're done for now, turn off clock request. */

	if ((bus->clkstate != CLK_PENDING)

	    && bus->idletime == BRCMF_IDLE_IMMEDIATE) {

		bus->activity = false;

		brcmf_dbg(SDIO, "idle state\n");

		sdio_claim_host(bus->sdiodev->func[1]);

		brcmf_sdio_bus_sleep(bus, true, false);

		sdio_release_host(bus->sdiodev->func[1]);

	}

}

}





static struct pktq *brcmf_sdio_bus_gettxq(struct device *dev)

static struct pktq *brcmf_sdio_bus_gettxq(struct device *dev)
@@ -2948,15 +2937,6 @@ brcmf_sdio_bus_txctl(struct device *dev, unsigned char *msg, uint msglen) 
		} while (ret < 0 && retries++ < TXRETRIES);

		} while (ret < 0 && retries++ < TXRETRIES);

	}

	}





	if ((bus->idletime == BRCMF_IDLE_IMMEDIATE) &&

	    atomic_read(&bus->dpc_tskcnt) == 0) {

		bus->activity = false;

		sdio_claim_host(bus->sdiodev->func[1]);

		brcmf_dbg(INFO, "idle\n");

		brcmf_sdio_clkctl(bus, CLK_NONE, true);

		sdio_release_host(bus->sdiodev->func[1]);

	}



	if (ret)

	if (ret)

		bus->sdcnt.tx_ctlerrs++;

		bus->sdcnt.tx_ctlerrs++;

	else

	else