Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91917c77 authored by Hante Meuleman's avatar Hante Meuleman Committed by John W. Linville
Browse files

brcmfmac: remove unused iswl variable. 



Variable iswl always gets initialised to the same and support for
this var is not needed.

Reviewed-by: default avatarArend Van Spriel <arend@broadcom.com>
Signed-off-by: default avatarHante Meuleman <meuleman@broadcom.com>
Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 81f5dcb8

drivers/net/wireless/brcm80211/brcmfmac/dhd.h

+0 −1
Original line number Diff line number Diff line
@@ -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 */

drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c

+0 −3
Original line number Diff line number Diff line
@@ -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;

}

drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c

+1 −9
Original line number Diff line number Diff line
@@ -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.

drivers/net/wireless/brcm80211/brcmfmac/dhd_proto.h

+1 −1
Original line number Diff line number Diff line
@@ -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);