brcmfmac: Remove unused caching dongle error.

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>

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
index 0388599f6be76293c3da774f07faa637e082164d..bbefaf38b4df366888a4b1f2b7d3aff2a23d0f25 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
@@ -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 */

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
index db3bc2e99902c3095fbc4e89ceed8461e3eebfb6..4557709d9655d64c28636145c48a985c1f3505c9 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
@@ -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;