Skip to contentSkip to conversation

rtlwifi: Correct inconsistent header guard

PATCH In review Wei Li 2 participants 6 messages Nov 8, 2022 – Nov 9, 2022

Subsystems (3)
lore
Share & tools
lore

Wei Li

author
#0 lore raw

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
author
#1 lore raw

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.

Fixes f0eb856e0b6c ("rtlwifi: rtl8188ee: Add new driver")
---
 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
index edcca42c7464..2f88a6faf535 100644
@@ -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
index eb8090caeec2..1573d277a920 100644
@@ -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
index 79f095e47d71..863ddcd98202 100644
@@ -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
index fd09b0712d17..3140b6938ffd 100644
@@ -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
index 67d3dc389ba0..da8a1af3606d 100644
@@ -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
index 8157ef419eeb..1fa9fd0d472a 100644
@@ -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
index 42e222c1795f..e1d6df65c5c4 100644
@@ -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
index 0fc8db8916fa..6392f2e24ac1 100644
@@ -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
index 05e27b40b2a9..76cb4cd2b5a2 100644
@@ -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
index df6065602401..dd4eee147b4c 100644
@@ -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
index e17f70b4d199..025087026068 100644
@@ -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
author
#2 lore raw

PATCH 2/3 rtlwifi: rtl8723ae: Correct the header guard of rtl8723ae/{fw,led,phy}.h

In reply to Wei Li

Rename the header guard of rtl8723ae/{fw,led,phy}.h from __RTL92C* to __RTL8723E* that corresponding with the module name.

Fixes c592e631bcec ("rtlwifi: rtl8723ae: Add new driver")
---
 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
index 3f9ed9b4428e..3ab4a7389012 100644
@@ -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
index 9f85845d23cd..372f02409dda 100644
@@ -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
index 98bfe02f66d5..40c89095fd57 100644
@@ -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
author
#3 lore raw

PATCH 3/3 rtlwifi: rtl8192de: Correct the header guard of rtl8192de/{dm,led}.h

In reply to Wei Li

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")
---
 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
index 939cc45bfebd..9cd9070a0281 100644
@@ -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
index 7599c7e5ecc3..71239a24f2c7 100644
@@ -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
maintainer
#4 lore raw
In reply to Wei Li
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 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 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 ++--
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

author
#5 lore raw
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 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 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 ++--
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