rtlwifi: Correct inconsistent header guard
cover rtlwifi: Correct inconsistent header guard
This patch set fixes some inconsistent header guards in module rtl8188ee/rtl8723ae/rtl8192de, that may be copied but missing update.
Wei Li (3):
rtlwifi: rtl8188ee: Correct the header guard of rtl8188ee/*.h
rtlwifi: rtl8723ae: Correct the header guard of
rtl8723ae/{fw,led,phy}.h rtlwifi: rtl8192de: Correct the header guard of rtl8192de/{dm,led}.h
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/def.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/pwrseq.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/rf.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/table.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8192de/led.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8723ae/led.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.h | 4 ++-- 16 files changed, 32 insertions(+), 32 deletions(-)
Signature · 1 line
2.25.1
PATCH 1/3 rtlwifi: rtl8188ee: Correct the header guard of rtl8188ee/*.h
The header guard of rtl8188ee/*.h now is promiscuous. Rename to __RTL88EE_* that corresponding with the module name.
--- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/def.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/pwrseq.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/rf.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/table.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.h | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/def.h +2 -2
@@ -1,8 +1,8 @@/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright(c) 2009-2013 Realtek Corporation.*/ -#ifndef __RTL92C_DEF_H__ -#define __RTL92C_DEF_H__ +#ifndef __RTL88EE_DEF_H__ +#define __RTL88EE_DEF_H__#define HAL_PRIME_CHNL_OFFSET_DONT_CARE 0#define HAL_PRIME_CHNL_OFFSET_LOWER 1
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.h +2 -2
@@ -1,8 +1,8 @@/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright(c) 2009-2013 Realtek Corporation.*/ -#ifndef __RTL88E_DM_H__ -#define __RTL88E_DM_H__ +#ifndef __RTL88EE_DM_H__ +#define __RTL88EE_DM_H__#define MAIN_ANT 0#define AUX_ANT 1
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.h +2 -2
@@ -1,8 +1,8 @@/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright(c) 2009-2013 Realtek Corporation.*/ -#ifndef __RTL92C__FW__H__ -#define __RTL92C__FW__H__ +#ifndef __RTL88EE__FW__H__ +#define __RTL88EE__FW__H__#define FW_8192C_SIZE 0x8000#define FW_8192C_START_ADDRESS 0x1000
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.h +2 -2
@@ -1,8 +1,8 @@/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright(c) 2009-2013 Realtek Corporation.*/ -#ifndef __RTL92CE_HW_H__ -#define __RTL92CE_HW_H__ +#ifndef __RTL88EE_HW_H__ +#define __RTL88EE_HW_H__void rtl88ee_get_hw_reg (struct ieee80211_hw *hw,u8 variable,u8 *val);void rtl88ee_read_eeprom_info (struct ieee80211_hw *hw);
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.h +2 -2
@@ -1,8 +1,8 @@/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright(c) 2009-2013 Realtek Corporation.*/ -#ifndef __RTL92CE_LED_H__ -#define __RTL92CE_LED_H__ +#ifndef __RTL88EE_LED_H__ +#define __RTL88EE_LED_H__void rtl88ee_init_sw_leds (struct ieee80211_hw *hw);void rtl88ee_sw_led_on (struct ieee80211_hw *hw,struct rtl_led *pled);
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.h +2 -2
@@ -1,8 +1,8 @@/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright(c) 2009-2013 Realtek Corporation.*/ -#ifndef __RTL92C_PHY_H__ -#define __RTL92C_PHY_H__ +#ifndef __RTL88EE_PHY_H__ +#define __RTL88EE_PHY_H__/* MAX_TX_COUNT must always set to 4, otherwise read efuse * table secquence will be wrong.
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/pwrseq.h +2 -2
@@ -1,8 +1,8 @@/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright(c) 2009-2013 Realtek Corporation.*/ -#ifndef __RTL8723E_PWRSEQ_H__ -#define __RTL8723E_PWRSEQ_H__ +#ifndef __RTL88EE_PWRSEQ_H__ +#define __RTL88EE_PWRSEQ_H__#include "../pwrseqcmd.h" /* Check document WM-20110607-Paul-RTL8188EE_Power_Architecture-R02.vsd
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h +2 -2
@@ -1,8 +1,8 @@/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright(c) 2009-2013 Realtek Corporation.*/ -#ifndef __RTL92C_REG_H__ -#define __RTL92C_REG_H__ +#ifndef __RTL88EE_REG_H__ +#define __RTL88EE_REG_H__#define TXPKT_BUF_SELECT 0x69#define RXPKT_BUF_SELECT 0xA5
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/rf.h +2 -2
@@ -1,8 +1,8 @@/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright(c) 2009-2013 Realtek Corporation.*/ -#ifndef __RTL92C_RF_H__ -#define __RTL92C_RF_H__ +#ifndef __RTL88EE_RF_H__ +#define __RTL88EE_RF_H__#define RF6052_MAX_TX_PWR 0x3F
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/table.h +2 -2
@@ -1,8 +1,8 @@/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright(c) 2009-2013 Realtek Corporation.*/ -#ifndef __RTL92CE_TABLE__H_ -#define __RTL92CE_TABLE__H_ +#ifndef __RTL88EE_TABLE__H_ +#define __RTL88EE_TABLE__H_#include <linux/types.h> #define RTL8188EEPHY_REG_1TARRAYLEN 382
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.h +2 -2
@@ -1,8 +1,8 @@/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright(c) 2009-2013 Realtek Corporation.*/ -#ifndef __RTL92CE_TRX_H__ -#define __RTL92CE_TRX_H__ +#ifndef __RTL88EE_TRX_H__ +#define __RTL88EE_TRX_H__#define TX_DESC_SIZE 64#define TX_DESC_AGGR_SUBFRAME_SIZE 32
Signature · 1 line
2.25.1
PATCH 2/3 rtlwifi: rtl8723ae: Correct the header guard of rtl8723ae/{fw,led,phy}.h
In reply to Wei LiRename the header guard of rtl8723ae/{fw,led,phy}.h from __RTL92C* to __RTL8723E* that corresponding with the module name.
--- drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8723ae/led.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.h +2 -2
@@ -1,8 +1,8 @@/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright(c) 2009-2012 Realtek Corporation.*/ -#ifndef __RTL92C__FW__H__ -#define __RTL92C__FW__H__ +#ifndef __RTL8723E__FW__H__ +#define __RTL8723E__FW__H__#define FW_8192C_SIZE 0x3000#define FW_8192C_START_ADDRESS 0x1000
drivers/net/wireless/realtek/rtlwifi/rtl8723ae/led.h +2 -2
@@ -1,8 +1,8 @@/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright(c) 2009-2012 Realtek Corporation.*/ -#ifndef __RTL92CE_LED_H__ -#define __RTL92CE_LED_H__ +#ifndef __RTL8723E_LED_H__ +#define __RTL8723E_LED_H__void rtl8723e_init_sw_leds (struct ieee80211_hw *hw);void rtl8723e_sw_led_on (struct ieee80211_hw *hw,struct rtl_led *pled);
drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.h +2 -2
@@ -1,8 +1,8 @@/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright(c) 2009-2012 Realtek Corporation.*/ -#ifndef __RTL92C_PHY_H__ -#define __RTL92C_PHY_H__ +#ifndef __RTL8723E_PHY_H__ +#define __RTL8723E_PHY_H__#define MAX_PRECMD_CNT 16#define MAX_RFDEPENDCMD_CNT 16
Signature · 1 line
2.25.1
PATCH 3/3 rtlwifi: rtl8192de: Correct the header guard of rtl8192de/{dm,led}.h
In reply to Wei LiRename the header guard of rtl8192de/{dm,led}.h from __RTL92C* to __RTL92D* that corresponding with the module name.
--- drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8192de/led.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.h +2 -2
@@ -1,8 +1,8 @@/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright(c) 2009-2012 Realtek Corporation.*/ -#ifndef __RTL92C_DM_H__ -#define __RTL92C_DM_H__ +#ifndef __RTL92D_DM_H__ +#define __RTL92D_DM_H__#define HAL_DM_DIG_DISABLE BIT(0)#define HAL_DM_HIPWR_DISABLE BIT(1)
drivers/net/wireless/realtek/rtlwifi/rtl8192de/led.h +2 -2
@@ -1,8 +1,8 @@/* SPDX-License-Identifier: GPL-2.0 */ /* Copyright(c) 2009-2012 Realtek Corporation.*/ -#ifndef __RTL92CE_LED_H__ -#define __RTL92CE_LED_H__ +#ifndef __RTL92DE_LED_H__ +#define __RTL92DE_LED_H__void rtl92de_init_sw_leds (struct ieee80211_hw *hw);void rtl92de_sw_led_on (struct ieee80211_hw *hw,struct rtl_led *pled);
Signature · 1 line
2.25.1
Ping-Ke Shih
maintainerQuoted 9 lines
-----Original Message-----
From: Wei Li <[email protected]>
Sent: Tuesday, November 8, 2022 5:35 PM
To: Ping-Ke Shih <[email protected]>; Kalle Valo <[email protected]>; David S. Miller <[email protected]>; Eric Dumazet <[email protected]>; Jakub Kicinski <[email protected]>; Paolo Abeni <[email protected]>
Cc: [email protected]; [email protected]; [email protected]
Subject: [PATCH v1 0/3] rtlwifi: Correct inconsistent header guard
Subject prefix should be "wifi: rtlwifi: ..."
Quoted 19 lines
This patch set fixes some inconsistent header guards in module rtl8188ee/rtl8723ae/rtl8192de, that may be copied but missing update.
Wei Li (3):
rtlwifi: rtl8188ee: Correct the header guard of rtl8188ee/*.h
rtlwifi: rtl8723ae: Correct the header guard ofrtl8723ae/{fw,led,phy}.hrtlwifi: rtl8192de: Correct the header guard of
rtl8192de/{dm,led}.hdrivers/net/wireless/realtek/rtlwifi/rtl8188ee/def.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/pwrseq.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/rf.h | 4 ++--
Quoted 8 lines
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/table.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8192de/led.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8723ae/led.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.h | 4 ++-- 16 files changed, 32 insertions(+), 32 deletions(-)
The changes aren't too much and commit contents/messages are very similar, so I would like to squash 3 patches into single one.
Ping-Ke
Quoted 39 lines · Ping-Ke Shih
Quoted 9 lines
-----Original Message-----
From: Wei Li <[email protected]>
Sent: Tuesday, November 8, 2022 5:35 PM
To: Ping-Ke Shih <[email protected]>; Kalle Valo <[email protected]>; David S. Miller <[email protected]>; Eric Dumazet <[email protected]>; Jakub Kicinski <[email protected]>; Paolo Abeni <[email protected]>
Cc: [email protected]; [email protected]; [email protected]
Subject: [PATCH v1 0/3] rtlwifi: Correct inconsistent header guardSubject prefix should be "wifi: rtlwifi: ..."
Quoted 19 lines
This patch set fixes some inconsistent header guards in module rtl8188ee/rtl8723ae/rtl8192de, that may be copied but missing update.
Wei Li (3):
rtlwifi: rtl8188ee: Correct the header guard of rtl8188ee/*.h
rtlwifi: rtl8723ae: Correct the header guard ofrtl8723ae/{fw,led,phy}.hrtlwifi: rtl8192de: Correct the header guard of
rtl8192de/{dm,led}.hdrivers/net/wireless/realtek/rtlwifi/rtl8188ee/def.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/pwrseq.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/rf.h | 4 ++--Quoted 8 lines
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/table.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8192de/led.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8723ae/led.h | 4 ++-- drivers/net/wireless/realtek/rtlwifi/rtl8723ae/phy.h | 4 ++-- 16 files changed, 32 insertions(+), 32 deletions(-)
Quoted 2 lines
The changes aren't too much and commit contents/messages are very similar, so I would like to squash 3 patches into single one.
OK, I will combine this series in one patch, and fix the prefix in v2, thanks for your suggestion.
Thanks,
Wei