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

Commit 98ce9035 authored by Franky Lin's avatar Franky Lin Committed by John W. Linville
Browse files

brcm80211: fmac: remove duplicate regiter set in chip attach path 



Same register writes have been done in brcmf_sdbrcm_probe_init
which is earlier in the same code path.

Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 960908dc

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

+0 −13
Original line number Diff line number Diff line
@@ -3872,7 +3872,6 @@ brcmf_sdbrcm_chip_attach(struct brcmf_bus *bus, u32 regs) 
{

	struct chip_info *ci;

	int err;

	u8 clkval;



	brcmf_dbg(TRACE, "Enter\n");
@@ -3885,18 +3884,6 @@ brcmf_sdbrcm_chip_attach(struct brcmf_bus *bus, u32 regs) 
	if (err)

		goto fail;



	/* Disable F2 to clear any intermediate frame state on the dongle */

	brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_0, SDIO_CCCR_IOEx,

		SDIO_FUNC_ENABLE_1, NULL);



	/* WAR: cmd52 backplane read so core HW will drop ALPReq */

	clkval = brcmf_sdcard_cfg_read(bus->sdiodev, SDIO_FUNC_1,

			0, NULL);



	/* Done with backplane-dependent accesses, can drop clock... */

	brcmf_sdcard_cfg_write(bus->sdiodev, SDIO_FUNC_1,

			       SBSDIO_FUNC1_CHIPCLKCSR, 0, NULL);



	bus->ci = ci;

	return 0;

fail: