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

Commit 16035d51 authored by Franky Lin's avatar Franky Lin Committed by John W. Linville
Browse files

brcmfmac: remove redundant chip ID check in dhd_sdio 



There is an ID table registered to SDIO stack which consists of all SDIO devices
supported by brcmfmac. It is not necessary to have an extra check.

Reviewed-by: default avatarHante Meuleman <meuleman@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
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 fccfe930

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

+0 −22
Original line number Diff line number Diff line
@@ -3509,23 +3509,6 @@ static bool brcmf_sdbrcm_bus_watchdog(struct brcmf_sdio *bus) 
	return (atomic_read(&bus->ipend) > 0);

}



static bool brcmf_sdbrcm_chipmatch(u16 chipid)

{

	if (chipid == BCM43143_CHIP_ID)

		return true;

	if (chipid == BCM43241_CHIP_ID)

		return true;

	if (chipid == BCM4329_CHIP_ID)

		return true;

	if (chipid == BCM4330_CHIP_ID)

		return true;

	if (chipid == BCM4334_CHIP_ID)

		return true;

	if (chipid == BCM4335_CHIP_ID)

		return true;

	return false;

}



static void brcmf_sdio_dataworker(struct work_struct *work)

{

	struct brcmf_sdio *bus = container_of(work, struct brcmf_sdio,
@@ -3622,11 +3605,6 @@ brcmf_sdbrcm_probe_attach(struct brcmf_sdio *bus, u32 regsva) 
		goto fail;

	}



	if (!brcmf_sdbrcm_chipmatch((u16) bus->ci->chip)) {

		brcmf_err("unsupported chip: 0x%04x\n", bus->ci->chip);

		goto fail;

	}



	if (brcmf_sdbrcm_kso_init(bus)) {

		brcmf_err("error enabling KSO\n");

		goto fail;