Commit fe2df2e0 authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: remove IS_HARDWARE_TYPE_8188* macros 



The IS_HARDWARE_TYPE_8188* macros are not needed because the driver
is for RTL8188EU chips, remove them.

Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210903093354.12645-6-straube.linux@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3d9ff614

drivers/staging/r8188eu/hal/rtl8188e_mp.c

+9 −11
Original line number Diff line number Diff line
@@ -506,12 +506,11 @@ void Hal_SetSingleToneTx(struct adapter *pAdapter, u8 bStart) 
	if (bStart) {

		/*  Start Single Tone. */

		/*  <20120326, Kordan> To amplify the power of tone for Xtal calibration. (asked by Edlu) */

		if (IS_HARDWARE_TYPE_8188E(pAdapter)) {

		reg58 = PHY_QueryRFReg(pAdapter, RF_PATH_A, LNA_Low_Gain_3, bRFRegOffsetMask);

		reg58 &= 0xFFFFFFF0;

		reg58 += 2;

		PHY_SetRFReg(pAdapter, RF_PATH_A, LNA_Low_Gain_3, bRFRegOffsetMask, reg58);

		}



		PHY_SetBBReg(pAdapter, rFPGA0_RFMOD, bCCKEn, 0x0);

		PHY_SetBBReg(pAdapter, rFPGA0_RFMOD, bOFDMEn, 0x0);
@@ -528,11 +527,10 @@ void Hal_SetSingleToneTx(struct adapter *pAdapter, u8 bStart) 
		/*  Stop Single Tone. */

		/*  <20120326, Kordan> To amplify the power of tone for Xtal calibration. (asked by Edlu) */

		/*  <20120326, Kordan> Only in single tone mode. (asked by Edlu) */

		if (IS_HARDWARE_TYPE_8188E(pAdapter)) {

		reg58 = PHY_QueryRFReg(pAdapter, RF_PATH_A, LNA_Low_Gain_3, bRFRegOffsetMask);

		reg58 &= 0xFFFFFFF0;

		PHY_SetRFReg(pAdapter, RF_PATH_A, LNA_Low_Gain_3, bRFRegOffsetMask, reg58);

		}



		write_bbreg(pAdapter, rFPGA0_RFMOD, bCCKEn, 0x1);

		write_bbreg(pAdapter, rFPGA0_RFMOD, bOFDMEn, 0x1);

drivers/staging/r8188eu/include/hal_intf.h

+0 −11
Original line number Diff line number Diff line
@@ -283,17 +283,6 @@ enum hardware_type { 
	HARDWARE_TYPE_MAX,

};



/*  RTL8188E Series */

#define IS_HARDWARE_TYPE_8188EE(_Adapter)			\

(((struct adapter *)_Adapter)->HardwareType == HARDWARE_TYPE_RTL8188EE)

#define IS_HARDWARE_TYPE_8188EU(_Adapter)			\

(((struct adapter *)_Adapter)->HardwareType == HARDWARE_TYPE_RTL8188EU)

#define IS_HARDWARE_TYPE_8188ES(_Adapter)			\

(((struct adapter *)_Adapter)->HardwareType == HARDWARE_TYPE_RTL8188ES)

#define	IS_HARDWARE_TYPE_8188E(_Adapter)	\

(IS_HARDWARE_TYPE_8188EE(_Adapter) || IS_HARDWARE_TYPE_8188EU(_Adapter) || \

 IS_HARDWARE_TYPE_8188ES(_Adapter))



#define GET_EEPROM_EFUSE_PRIV(adapter) (&adapter->eeprompriv)



#define is_boot_from_eeprom(adapter) (adapter->eeprompriv.EepromOrEfuse)