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

Commit 3a1ea9fd authored by Catalin Iacob's avatar Catalin Iacob Committed by John W. Linville
Browse files

rtlwifi: remove duplicate declarations and macros in headers 



This patch brings no functional change.

There are still duplicate macros across the rtlwifi directory, for example
IQK_DELAY_TIME is defined multiple times, sometimes with different values,
this patch only removes duplicates within the same header file.

Signed-off-by: default avatarCatalin Iacob <iacobcatalin@gmail.com>
Acked-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 551ed409

drivers/net/wireless/rtlwifi/base.h

+0 −1
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ void rtl_init_rfkill(struct ieee80211_hw *hw); 
void rtl_deinit_rfkill(struct ieee80211_hw *hw);



void rtl_beacon_statistic(struct ieee80211_hw *hw, struct sk_buff *skb);

void rtl_watch_dog_timer_callback(unsigned long data);

void rtl_deinit_deferred_work(struct ieee80211_hw *hw);



bool rtl_action_proc(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx);

drivers/net/wireless/rtlwifi/rtl8192c/phy_common.h

+0 −2
Original line number Diff line number Diff line
@@ -39,9 +39,7 @@ 
#define RT_CANNOT_IO(hw)		false

#define HIGHPOWER_RADIOA_ARRAYLEN	22



#define IQK_ADDA_REG_NUM		16

#define MAX_TOLERANCE			5

#define	IQK_DELAY_TIME			1



#define	APK_BB_REG_NUM			5

#define	APK_AFE_REG_NUM			16

drivers/net/wireless/rtlwifi/rtl8192ce/def.h

+0 −2
Original line number Diff line number Diff line
@@ -152,8 +152,6 @@ enum version_8192c { 
#define IS_VENDOR_UMC_A_CUT(version)	((IS_CHIP_VENDOR_UMC(version)) ? \

	((GET_CVID_CUT_VERSION(version)) ? false : true) : false)

#define IS_CHIP_VER_B(version)  ((version & CHIP_VER_B) ? true : false)

#define IS_VENDOR_UMC_A_CUT(version)	((IS_CHIP_VENDOR_UMC(version)) ? \

	((GET_CVID_CUT_VERSION(version)) ? false : true) : false)

#define IS_92C_SERIAL(version)  ((version & CHIP_92C_BITMASK) ? true : false)

#define IS_CHIP_VENDOR_UMC(version)		\

	((version & CHIP_VENDOR_UMC) ? true : false)

drivers/net/wireless/rtlwifi/rtl8192ce/phy.h

+0 −3
Original line number Diff line number Diff line
@@ -39,9 +39,7 @@ 
#define RT_CANNOT_IO(hw)		false

#define HIGHPOWER_RADIOA_ARRAYLEN	22



#define IQK_ADDA_REG_NUM		16

#define MAX_TOLERANCE			5

#define	IQK_DELAY_TIME			1



#define	APK_BB_REG_NUM			5

#define	APK_AFE_REG_NUM			16
@@ -226,7 +224,6 @@ bool rtl92c_phy_config_rf_with_headerfile(struct ieee80211_hw *hw, 
					  enum radio_path rfpath);

bool rtl8192_phy_check_is_legal_rfpath(struct ieee80211_hw *hw,

					      u32 rfpath);

bool rtl92c_phy_set_io_cmd(struct ieee80211_hw *hw, enum io_type iotype);

bool rtl92ce_phy_set_rf_power_state(struct ieee80211_hw *hw,

					  enum rf_pwrstate rfpwr_state);

void rtl92ce_phy_set_rf_on(struct ieee80211_hw *hw);

drivers/net/wireless/rtlwifi/rtl8192ce/reg.h

+0 −20
Original line number Diff line number Diff line
@@ -560,7 +560,6 @@ 
#define	EEPROM_DEFAULT_TXPOWERLEVEL		0x22

#define	EEPROM_DEFAULT_HT40_2SDIFF		0x0

#define EEPROM_DEFAULT_HT20_DIFF		2

#define	EEPROM_DEFAULT_LEGACYHTTXPOWERDIFF	0x3

#define EEPROM_DEFAULT_HT40_PWRMAXOFFSET	0

#define EEPROM_DEFAULT_HT20_PWRMAXOFFSET	0
@@ -639,17 +638,8 @@ 


#define	EEPROM_TXPWR_GROUP			0x6F



#define EEPROM_TSSI_A				0x76

#define EEPROM_TSSI_B				0x77

#define EEPROM_THERMAL_METER			0x78



#define EEPROM_CHANNELPLAN			0x75



#define RF_OPTION1				0x79

#define RF_OPTION2				0x7A

#define RF_OPTION3				0x7B

#define RF_OPTION4				0x7C



#define	STOPBECON				BIT(6)

#define	STOPHIGHT				BIT(5)

#define	STOPMGT					BIT(4)
@@ -689,13 +679,6 @@ 
#define RSV_CTRL				0x001C

#define RD_CTRL					0x0524



#define REG_USB_INFO				0xFE17

#define REG_USB_SPECIAL_OPTION			0xFE55



#define REG_USB_DMA_AGG_TO			0xFE5B

#define REG_USB_AGG_TO				0xFE5C

#define REG_USB_AGG_TH				0xFE5D



#define REG_USB_VID				0xFE60

#define REG_USB_PID				0xFE62

#define REG_USB_OPTIONAL			0xFE64
@@ -1196,9 +1179,6 @@ 
#define POLLING_LLT_THRESHOLD			20

#define POLLING_READY_TIMEOUT_COUNT		1000



#define	MAX_MSS_DENSITY_2T			0x13

#define	MAX_MSS_DENSITY_1T			0x0A



#define EPROM_CMD_OPERATING_MODE_MASK	((1<<7)|(1<<6))

#define EPROM_CMD_CONFIG			0x3

#define EPROM_CMD_LOAD				1