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

Commit 0d62b4db authored by Roland Vossen's avatar Roland Vossen Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: cleaned up softmac phy macro's affecting code flow 



Substituted macro's.

Reported-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarRoland Vossen <rvossen@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 33bc9551

drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c

+4 −2
Original line number Diff line number Diff line
@@ -204,7 +204,8 @@ u16 read_radio_reg(struct brcms_phy *pi, u16 addr) 


	switch (pi->pubpi.phy_type) {

	case PHY_TYPE_N:

		CASECHECK(PHYTYPE, PHY_TYPE_N);

		if (!CONF_HAS(PHYTYPE, PHY_TYPE_N))

			break;

		if (NREV_GE(pi->pubpi.phy_rev, 7))

			addr |= RADIO_2057_READ_OFF;

		else
@@ -212,7 +213,8 @@ u16 read_radio_reg(struct brcms_phy *pi, u16 addr) 
		break;



	case PHY_TYPE_LCN:

		CASECHECK(PHYTYPE, PHY_TYPE_LCN);

		if (!CONF_HAS(PHYTYPE, PHY_TYPE_LCN))

			break;

		addr |= RADIO_2064_READ_OFF;

		break;

drivers/staging/brcm80211/brcmsmac/types.h

+0 −5
Original line number Diff line number Diff line
@@ -220,11 +220,6 @@ 
#define PHYTYPE_IS(var, val)\

	(PHYCONF_HAS(val) && (PHYCONF_IS(val) || ((var) == (val))))



/* Finally, early-exit from switch case if anyone wants it... */



#define CASECHECK(config, val)	if (!(CONF_HAS(config, val))) break

#define CASEMSK(config, mask)	if (!(CONF_MSK(config, mask))) break



/* Set up PHYTYPE automatically: (depends on PHY_TYPE_X, from d11.h) */



#define _PHYCONF_N (1 << PHY_TYPE_N)