From: "Arend van Spriel" <arend@broadcom.com>
To: "John W. Linville" <linville@tuxdriver.com>
Cc: "Linux Wireless List" <linux-wireless@vger.kernel.org>,
"Hante Meuleman" <meuleman@broadcom.com>,
"Arend van Spriel" <arend@broadcom.com>
Subject: [PATCH 15/18] brcmfmac: Remove unused caching dongle error.
Date: Wed, 2 Jan 2013 15:22:48 +0100 [thread overview]
Message-ID: <1357136572-18273-16-git-send-email-arend@broadcom.com> (raw)
In-Reply-To: <1357136572-18273-1-git-send-email-arend@broadcom.com>
From: Hante Meuleman <meuleman@broadcom.com>
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>
---
drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 3 ---
drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c | 22 ++-------------------
2 files changed, 2 insertions(+), 23 deletions(-)
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
index 0388599..bbefaf3 100644
--- 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 db3bc2e..4557709 100644
--- 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;
--
1.7.10.4
next prev parent reply other threads:[~2013-01-02 14:23 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-02 14:22 [PATCH 00/18] brcm80211: cleanup work Arend van Spriel
2013-01-02 14:22 ` [PATCH 01/18] brcmsmac: increase timer reference count for new timers only Arend van Spriel
2013-01-02 14:22 ` [PATCH 02/18] brcmsmac: use perimeter lock in add_interface() callback Arend van Spriel
2013-01-02 14:22 ` [PATCH 03/18] brcmsmac: allow user-space setting of interface address Arend van Spriel
2013-01-02 14:22 ` [PATCH 04/18] brcmsmac: remove dead code Arend van Spriel
2013-01-02 14:22 ` [PATCH 05/18] brcmfmac: do not reconfigure refill rx on 0-length packet Arend van Spriel
2013-01-02 14:22 ` [PATCH 06/18] brcmfmac: removed deprecated set_bitrate_mask support Arend van Spriel
2013-01-02 14:22 ` [PATCH 07/18] brcmfmac: assure USB dongle firmware is reset upon module unload Arend van Spriel
2013-01-02 14:22 ` [PATCH 08/18] brcmfmac: define pr_fmt in one place Arend van Spriel
2013-01-02 17:52 ` Joe Perches
2013-01-02 20:07 ` Arend van Spriel
2013-01-02 20:20 ` [PATCH v2 " Arend van Spriel
2013-01-02 20:34 ` Joe Perches
2013-01-02 20:52 ` Arend van Spriel
2013-01-02 14:22 ` [PATCH 09/18] brcmfmac: remove rx helper function from bus interface Arend van Spriel
2013-01-02 14:22 ` [PATCH 10/18] brcmfmac: remove brcmf_proto_hdrpull() " Arend van Spriel
2013-01-02 14:22 ` [PATCH 11/18] brcmfmac: Use dedicated trace level for CDC Arend van Spriel
2013-01-02 14:22 ` [PATCH 12/18] brcmfmac: remove unused event related definitions Arend van Spriel
2013-01-02 14:22 ` [PATCH 13/18] brcmfmac: cleanup netdev transmit callback Arend van Spriel
2013-01-02 14:22 ` [PATCH 14/18] brcmfmac: remove unnecessary curly braces in dhd_attach() Arend van Spriel
2013-01-02 14:22 ` Arend van Spriel [this message]
2013-01-02 14:22 ` [PATCH 16/18] brcmfmac: Return correct error on netdev xmit Arend van Spriel
2013-01-02 14:22 ` [PATCH 17/18] brcmfmac: Removing obsolete variables and inline functions Arend van Spriel
2013-01-02 14:22 ` [PATCH 18/18] brcmfmac: Update init code routines from interface up Arend van Spriel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1357136572-18273-16-git-send-email-arend@broadcom.com \
--to=arend@broadcom.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=meuleman@broadcom.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).