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

Commit 0bc9a8cb authored by Piotr Haber's avatar Piotr Haber Committed by John W. Linville
Browse files

brcmfmac: remove unnecessary locking in trap info processing 



Locking host access in trap info processing
is not needed as bus access functions do it on
their own.

Reviewed-by: default avatarArend Van Spriel <arend@broadcom.com>
Reviewed-by: default avatarHante Meuleman <meuleman@broadcom.com>
Signed-off-by: default avatarPiotr Haber <phaber@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent bd16e355

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

+0 −4
Original line number Diff line number Diff line
@@ -2721,10 +2721,8 @@ static int brcmf_sdio_readshared(struct brcmf_sdio *bus, 
	}



	/* Read hndrte_shared structure */

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

	rv = brcmf_sdbrcm_membytes(bus, false, addr, (u8 *)&sh_le,

				   sizeof(struct sdpcm_shared_le));

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

	if (rv < 0)

		return rv;
@@ -2826,14 +2824,12 @@ static int brcmf_sdio_trap_info(struct brcmf_sdio *bus, struct sdpcm_shared *sh, 
	if ((sh->flags & SDPCM_SHARED_TRAP) == 0)

		return 0;



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

	error = brcmf_sdbrcm_membytes(bus, false, sh->trap_addr, (u8 *)&tr,

				      sizeof(struct brcmf_trap_info));

	if (error < 0)

		return error;



	nbytes = brcmf_sdio_dump_console(bus, sh, data, count);

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

	if (nbytes < 0)

		return nbytes;