From: "Arend van Spriel" <arend@broadcom.com>
To: "John W. Linville" <linville@tuxdriver.com>
Cc: linux-wireless <linux-wireless@vger.kernel.org>,
"Franky Lin" <frankyl@broadcom.com>,
"Arend van Spriel" <arend@broadcom.com>
Subject: [PATCH 6/8] brcmfmac: remove redundant chip ID check in dhd_sdio
Date: Tue, 18 Jun 2013 13:29:27 +0200 [thread overview]
Message-ID: <1371554970-23495-7-git-send-email-arend@broadcom.com> (raw)
In-Reply-To: <1371554970-23495-1-git-send-email-arend@broadcom.com>
From: Franky Lin <frankyl@broadcom.com>
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: Hante Meuleman <meuleman@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
---
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 22 --------------------
1 file changed, 22 deletions(-)
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
index d4db0c7..cb22f2f 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
@@ -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;
--
1.7.10.4
next prev parent reply other threads:[~2013-06-18 11:29 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-18 11:29 [PATCH 0/8] brcmfmac: scatterlist support in sdio and cleanup Arend van Spriel
2013-06-18 11:29 ` [PATCH 1/8] brcmfmac: Only use credits for bcmc when firmware indicates it Arend van Spriel
2013-06-18 11:29 ` [PATCH 2/8] brcmfmac: rename variable prec to more appropriate name, ie. fifo Arend van Spriel
2013-06-18 11:29 ` [PATCH 3/8] brcmfmac: remove dependency with nl80211.h Arend van Spriel
2013-06-18 11:29 ` [PATCH 4/8] brcmfmac: consolidate mac_descriptor related function names Arend van Spriel
2013-06-18 11:29 ` [PATCH 5/8] brcmfmac: simplify dpc handling using atomic operations Arend van Spriel
2013-06-18 11:29 ` Arend van Spriel [this message]
2013-06-18 11:29 ` [PATCH 7/8] brcmfmac: replace brcmf_sdioh_request_buffer with brcmf_sdio_buffrw Arend van Spriel
2013-06-18 11:29 ` [PATCH 8/8] brcmfmac: add sdio sg list support 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=1371554970-23495-7-git-send-email-arend@broadcom.com \
--to=arend@broadcom.com \
--cc=frankyl@broadcom.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.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