leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

brcmfmac: remove unused iswl variable.

Browse Source 
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>
This commit is contained in:
Hante Meuleman 2012-10-22 10:36:15 -07:00 committed by John W. Linville
parent 81f5dcb808
commit 91917c77d2
4 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/wireless/brcm80211/brcmfmac/dhd.h
View File

@ -629,7 +629,6 @@ struct brcmf_pub {
u8 wme_dp; /* wme discard priority */ u8 wme_dp; /* wme discard priority */
/* Dongle media info */ /* Dongle media info */
bool iswl; /* Dongle-resident driver is wl */
unsigned long drv_version; /* Version of dongle-resident driver */ unsigned long drv_version; /* Version of dongle-resident driver */
u8 mac[ETH_ALEN]; /* MAC address obtained from dongle */ u8 mac[ETH_ALEN]; /* MAC address obtained from dongle */

3
drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
View File

@ -481,9 +481,6 @@ int brcmf_proto_init(struct brcmf_pub *drvr)
ret = brcmf_c_preinit_dcmds(drvr); ret = brcmf_c_preinit_dcmds(drvr);
/* Always assumes wl for now */
drvr->iswl = true;
return ret; return ret;
} }

10
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
View File

@ -619,12 +619,9 @@ static int brcmf_ethtool(struct brcmf_pub *drvr, void __user *uaddr)
brcmf_dbg(ERROR, "dongle is not up\n"); brcmf_dbg(ERROR, "dongle is not up\n");
return -ENODEV; return -ENODEV;
} }
/* finally, report dongle driver type */ /* finally, report dongle driver type */
else if (drvr->iswl)
sprintf(info.driver, "wl");
else else
sprintf(info.driver, "xx"); sprintf(info.driver, "wl");
sprintf(info.version, "%lu", drvr->drv_version); sprintf(info.version, "%lu", drvr->drv_version);
if (copy_to_user(uaddr, &info, sizeof(info))) 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; goto done;
} }
if (!drvr->iswl) {
err = -EIO;
goto done;
}
/* /*
* Intercept BRCMF_C_SET_KEY CMD - serialize M4 send and * Intercept BRCMF_C_SET_KEY CMD - serialize M4 send and
* set key CMD to prevent M4 encryption. * set key CMD to prevent M4 encryption.

2
drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h
View File

@ -28,7 +28,7 @@ extern int brcmf_proto_attach(struct brcmf_pub *drvr);
extern void brcmf_proto_detach(struct brcmf_pub *drvr); extern void brcmf_proto_detach(struct brcmf_pub *drvr);
/* Initialize protocol: sync w/dongle state. /* 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); extern int brcmf_proto_init(struct brcmf_pub *drvr);