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

Commit 0a980d45 authored by Arend van Spriel's avatar Arend van Spriel Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: remove macro definitions from brcmsmac Makefile 



The Makefile for the brcmsmac driver contains macro definitions that
are always set and even some are not used in the source code anymore.
This patch removes those definitions from the Makefile and source code.

Reported-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Reviewed-by: default avatarFranky (Zhenhui) Lin <frankyl@broadcom.com>
Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Signed-off-by: default avatarRoland Vossen <rvossen@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 04831578

drivers/staging/brcm80211/brcmsmac/Makefile

+0 −7
Original line number Diff line number Diff line
@@ -16,13 +16,6 @@ 
# CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.



ccflags-y :=				\

	-DWLC_HIGH				\

	-DWLC_LOW				\

	-DSTA					\

	-DWME					\

	-DWL11N					\

	-DDBAND					\

	-DBCMNVRAMR				\

	-Idrivers/staging/brcm80211/brcmsmac \

	-Idrivers/staging/brcm80211/brcmsmac/phy \

	-Idrivers/staging/brcm80211/include

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

+1 −4
Original line number Diff line number Diff line
@@ -1666,13 +1666,10 @@ void wlc_phy_txpower_recalc_target(struct brcms_phy *pi) 
			}

		}

	}

#if WL11N



	max_num_rate = ((ISNPHY(pi)) ? (TXP_NUM_RATES) :

			((ISLCNPHY(pi)) ?

			 (TXP_LAST_SISO_MCS_20 + 1) : (TXP_LAST_OFDM + 1)));

#else

	max_num_rate = ((ISNPHY(pi)) ? (TXP_NUM_RATES) : (TXP_LAST_OFDM + 1));

#endif



	wlc_phy_upd_env_txpwr_rate_limits(pi, band);

drivers/staging/brcm80211/brcmsmac/srom.c

+2 −10
Original line number Diff line number Diff line
@@ -798,9 +798,7 @@ static int initvars_srom_pci(struct si_pub *sih, void *curmap, char **vars, 
			     uint *count);

static int sprom_read_pci(struct si_pub *sih, u16 *sprom,

			  uint wordoff, u16 *buf, uint nwords, bool check_crc);

#if defined(BCMNVRAMR)

static int otp_read_pci(struct si_pub *sih, u16 *buf, uint bufsz);

#endif



static int initvars_table(char *start, char *end,

			  char **vars, uint *count);
@@ -940,7 +938,6 @@ sprom_read_pci(struct si_pub *sih, u16 *sprom, uint wordoff, 
	return err;

}



#if defined(BCMNVRAMR)

static int otp_read_pci(struct si_pub *sih, u16 *buf, uint bufsz)

{

	u8 *otp;
@@ -976,7 +973,7 @@ static int otp_read_pci(struct si_pub *sih, u16 *buf, uint bufsz) 


	return err;

}

#endif				/* defined(BCMNVRAMR) */



/*

* Create variable table from memory.

* Return 0 on success, nonzero on error.
@@ -1208,18 +1205,13 @@ static int initvars_srom_pci(struct si_pub *sih, void *curmap, char **vars, 
				sromrev = 1;

		}

	}

#if defined(BCMNVRAMR)

	/* Use OTP if SPROM not available */

	else {

		/* Use OTP if SPROM not available */

		err = otp_read_pci(sih, srom, SROM_MAX);

		if (err == 0)

			/* OTP only contain SROM rev8/rev9 for now */

			sromrev = srom[SROM4_CRCREV] & 0xff;

	}

#else

	else

		err = -ENODEV;

#endif



	if (!err) {

		/* Bitmask for the sromrev */