Skip to content

Commit

Permalink
brcmfmac: Remove unused caching dongle error.
Browse files Browse the repository at this point in the history
CDC errors are retained. However, it is never used so it can
be removed.

Reviewed-by: Arend Van Spriel <arend@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Hante Meuleman authored and John W. Linville committed Jan 7, 2013
1 parent b84e311 commit 03abad0
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 23 deletions.
3 changes: 0 additions & 3 deletions drivers/net/wireless/brcm80211/brcmfmac/dhd.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
22 changes: 2 additions & 20 deletions drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -207,11 +195,8 @@ brcmf_proto_cdc_query_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;
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 03abad0

Please sign in to comment.