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(-)
--
2.25.1
Rename the header guard of rtl8192de/{dm,led}.h from __RTL92C* to
__RTL92D* that corresponding with the module name.
Fixes: 4f01358e5b8a ("rtlwifi: rtl8192de: Merge dynamic management routines")
Signed-off-by: Wei Li <[email protected]>
---
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(-)
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.h
index 939cc45bfebd..9cd9070a0281 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/dm.h
@@ -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)
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/led.h b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/led.h
index 7599c7e5ecc3..71239a24f2c7 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/led.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/led.h
@@ -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);
--
2.25.1
The header guard of rtl8188ee/*.h now is promiscuous.
Rename to __RTL88EE_* that corresponding with the module name.
Fixes: f0eb856e0b6c ("rtlwifi: rtl8188ee: Add new driver")
Signed-off-by: Wei Li <[email protected]>
---
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(-)
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/def.h b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/def.h
index edcca42c7464..2f88a6faf535 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/def.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/def.h
@@ -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
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.h b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.h
index eb8090caeec2..1573d277a920 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/dm.h
@@ -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
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.h
index 79f095e47d71..863ddcd98202 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.h
@@ -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
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.h b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.h
index fd09b0712d17..3140b6938ffd 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.h
@@ -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);
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.h b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.h
index 67d3dc389ba0..da8a1af3606d 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/led.h
@@ -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);
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.h b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.h
index 8157ef419eeb..1fa9fd0d472a 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/phy.h
@@ -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.
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/pwrseq.h b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/pwrseq.h
index 42e222c1795f..e1d6df65c5c4 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/pwrseq.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/pwrseq.h
@@ -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
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h
index 0fc8db8916fa..6392f2e24ac1 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h
@@ -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
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/rf.h b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/rf.h
index 05e27b40b2a9..76cb4cd2b5a2 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/rf.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/rf.h
@@ -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
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/table.h b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/table.h
index df6065602401..dd4eee147b4c 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/table.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/table.h
@@ -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
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.h b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.h
index e17f70b4d199..025087026068 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.h
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.h
@@ -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
--
2.25.1
> -----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: ..."
>
> 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(-)
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
On 2022/11/9 8:32, Ping-Ke Shih wrote:
>
>
>> -----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: ..."
>>
>> 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(-)
>
> 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