diff options
| author | Hante Meuleman | 2012-10-22 19:36:15 +0200 |
|---|---|---|
| committer | John W. Linville | 2012-10-29 20:28:17 +0100 |
| commit | 91917c77d229be369df007e6a6f5638bca26cc2b (patch) | |
| tree | b137035cba9bd95cc6d9ab031df9bda8cbb5ce80 | |
| parent | brcmfmac: refactor firmware interface layer. (diff) | |
| download | kernel-qcow2-linux-91917c77d229be369df007e6a6f5638bca26cc2b.tar.gz kernel-qcow2-linux-91917c77d229be369df007e6a6f5638bca26cc2b.tar.xz kernel-qcow2-linux-91917c77d229be369df007e6a6f5638bca26cc2b.zip | |
brcmfmac: remove unused iswl variable.
Variable iswl always gets initialised to the same and support for
this var is not needed.
Reviewed-by: Arend Van Spriel <arend@broadcom.com>
Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
4 files changed, 2 insertions, 14 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h index a73da9dd05e0..c915d3362b42 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h @@ -629,7 +629,6 @@ struct brcmf_pub { u8 wme_dp; /* wme discard priority */ /* Dongle media info */ - bool iswl; /* Dongle-resident driver is wl */ unsigned long drv_version; /* Version of dongle-resident driver */ u8 mac[ETH_ALEN]; /* MAC address obtained from dongle */ diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c index a5c15cac5e7d..b07a438dd615 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c @@ -481,9 +481,6 @@ int brcmf_proto_init(struct brcmf_pub *drvr) ret = brcmf_c_preinit_dcmds(drvr); - /* Always assumes wl for now */ - drvr->iswl = true; - return ret; } diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c index 189c5be2b052..5f91fae5ebb1 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c @@ -619,12 +619,9 @@ static int brcmf_ethtool(struct brcmf_pub *drvr, void __user *uaddr) brcmf_dbg(ERROR, "dongle is not up\n"); return -ENODEV; } - /* finally, report dongle driver type */ - else if (drvr->iswl) - sprintf(info.driver, "wl"); else - sprintf(info.driver, "xx"); + sprintf(info.driver, "wl"); sprintf(info.version, "%lu", drvr->drv_version); if (copy_to_user(uaddr, &info, sizeof(info))) @@ -734,11 +731,6 @@ s32 brcmf_exec_dcmd(struct net_device *ndev, u32 cmd, void *arg, u32 len) goto done; } - if (!drvr->iswl) { - err = -EIO; - goto done; - } - /* * Intercept BRCMF_C_SET_KEY CMD - serialize M4 send and * set key CMD to prevent M4 encryption. diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h index 6bc4425a8b0f..f3e72de095dd 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h @@ -28,7 +28,7 @@ extern int brcmf_proto_attach(struct brcmf_pub *drvr); extern void brcmf_proto_detach(struct brcmf_pub *drvr); /* Initialize protocol: sync w/dongle state. - * Sets dongle media info (iswl, drv_version, mac address). + * Sets dongle media info (drv_version, mac address). */ extern int brcmf_proto_init(struct brcmf_pub *drvr); |