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

Commit 03abad08 authored by Hante Meuleman's avatar Hante Meuleman Committed by John W. Linville
Browse files

brcmfmac: Remove unused caching dongle error. 



CDC errors are retained. However, it is never used so it can
be removed.

Reviewed-by: default avatarArend Van Spriel <arend@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@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 b84e3112

drivers/net/wireless/brcm80211/brcmfmac/dhd.h

+0 −3
Original line number Diff line number Diff line
@@ -496,9 +496,6 @@ struct brcmf_pub { 
	/* Last error return */

	int bcmerror;



	/* Last error from dongle */

	int dongle_error;



	/* Suspend disable flag  flag */

	int suspend_disable_flag;	/* "1" to disable all extra powersaving

					 during suspend */

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

+2 −20
Original line number Diff line number Diff line
@@ -147,18 +147,6 @@ brcmf_proto_cdc_query_dcmd(struct brcmf_pub *drvr, int ifidx, uint cmd, 


	brcmf_dbg(CDC, "Enter, cmd %d len %d\n", cmd, len);



	/* Respond "bcmerror" and "bcmerrorstr" with local cache */

	if (cmd == BRCMF_C_GET_VAR && buf) {

		if (!strcmp((char *)buf, "bcmerrorstr")) {

			strncpy((char *)buf, "bcm_error",

				BCME_STRLEN);

			goto done;

		} else if (!strcmp((char *)buf, "bcmerror")) {

			*(int *)buf = drvr->dongle_error;

			goto done;

		}

	}



	memset(msg, 0, sizeof(struct brcmf_proto_cdc_dcmd));



	msg->cmd = cpu_to_le32(cmd);
@@ -207,11 +195,8 @@ retry: 
	}



	/* Check the ERROR flag */

	if (flags & CDC_DCMD_ERROR) {

	if (flags & CDC_DCMD_ERROR)

		ret = le32_to_cpu(msg->status);

		/* Cache error from dongle */

		drvr->dongle_error = ret;

	}



done:

	return ret;
@@ -258,11 +243,8 @@ int brcmf_proto_cdc_set_dcmd(struct brcmf_pub *drvr, int ifidx, uint cmd, 
	}



	/* Check the ERROR flag */

	if (flags & CDC_DCMD_ERROR) {

	if (flags & CDC_DCMD_ERROR)

		ret = le32_to_cpu(msg->status);

		/* Cache error from dongle */

		drvr->dongle_error = ret;

	}



done:

	return ret;