* [PATCH v2 0/3] staging: rtl8192e: trivial code cleanup patches
@ 2022-11-06 1:11 Jacob Bai
2022-11-06 1:11 ` [PATCH v2 1/3] staging: rtl8192e: rename tables in r8192e_hwimg.c Jacob Bai
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Jacob Bai @ 2022-11-06 1:11 UTC (permalink / raw)
To: gregkh, linux-staging, linux-kernel; +Cc: Jacob Bai
Rename few variables and source files to make it align with other
rtlwifi drivers.
The patches are required to be applied in sequence.
Changes in v2:
1. Patch 2: modify r8192E_firmware.c to include table.h instead of
r8192E_hwimg.h.
Jacob Bai (3):
staging: rtl8192e: rename tables in r8192e_hwimg.c
staging: rtl8192e: rename r8192E_hwimg.c/h to table.c/h
staging: rtl8192e: remove unnecesscary macro defines
drivers/staging/rtl8192e/rtl8192e/Makefile | 2 +-
.../rtl8192e/rtl8192e/r8192E_firmware.c | 2 +-
.../staging/rtl8192e/rtl8192e/r8192E_hwimg.h | 33 ------------
.../staging/rtl8192e/rtl8192e/r8192E_phy.c | 54 +++++++++----------
.../staging/rtl8192e/rtl8192e/r8192E_phy.h | 20 -------
.../rtl8192e/{r8192E_hwimg.c => table.c} | 20 +++----
drivers/staging/rtl8192e/rtl8192e/table.h | 33 ++++++++++++
7 files changed, 72 insertions(+), 92 deletions(-)
delete mode 100644 drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h
rename drivers/staging/rtl8192e/rtl8192e/{r8192E_hwimg.c => table.c} (95%)
create mode 100644 drivers/staging/rtl8192e/rtl8192e/table.h
--
2.34.1
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 1/3] staging: rtl8192e: rename tables in r8192e_hwimg.c
2022-11-06 1:11 [PATCH v2 0/3] staging: rtl8192e: trivial code cleanup patches Jacob Bai
@ 2022-11-06 1:11 ` Jacob Bai
2022-11-06 1:11 ` [PATCH v2 2/3] staging: rtl8192e: rename r8192E_hwimg.c/h to table.c/h Jacob Bai
2022-11-06 1:11 ` [PATCH v2 3/3] staging: rtl8192e: remove unnecesscary macro defines Jacob Bai
2 siblings, 0 replies; 7+ messages in thread
From: Jacob Bai @ 2022-11-06 1:11 UTC (permalink / raw)
To: gregkh, linux-staging, linux-kernel; +Cc: Jacob Bai
fix camel case issue.
Signed-off-by: Jacob Bai <jacob.bai.au@gmail.com>
---
.../staging/rtl8192e/rtl8192e/r8192E_hwimg.c | 18 +++++-----
.../staging/rtl8192e/rtl8192e/r8192E_hwimg.h | 36 +++++++++----------
.../staging/rtl8192e/rtl8192e/r8192E_phy.h | 36 +++++++++----------
3 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c
index e6fce749e65b..8920283f340e 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c
@@ -6,9 +6,9 @@
*/
#include "r8192E_hwimg.h"
-u32 Rtl8192PciEPHY_REGArray[PHY_REGArrayLengthPciE] = {0x0,};
+u32 RTL8192E_PHY_REG_ARRAY[RTL8192E_PHY_REG_ARRAY_LEN] = {0x0,};
-u32 Rtl8192PciEPHY_REG_1T2RArray[PHY_REG_1T2RArrayLengthPciE] = {
+u32 RTL8192E_PHY_REG_1T2R_ARRAY[RTL8192E_PHY_REG_1T2R_ARRAY_LEN] = {
0x800, 0x00000000,
0x804, 0x00000001,
0x808, 0x0000fc00,
@@ -159,7 +159,7 @@ u32 Rtl8192PciEPHY_REG_1T2RArray[PHY_REG_1T2RArrayLengthPciE] = {
0xe1c, 0x12121416,
};
-u32 Rtl8192PciERadioA_Array[RadioA_ArrayLengthPciE] = {
+u32 RTL8192E_RADIOA_ARRAY[RTL8192E_RADIOA_ARRAY_LEN] = {
0x019, 0x00000003,
0x000, 0x000000bf,
0x001, 0x00000ee0,
@@ -285,7 +285,7 @@ u32 Rtl8192PciERadioA_Array[RadioA_ArrayLengthPciE] = {
0x007, 0x00000700,
};
-u32 Rtl8192PciERadioB_Array[RadioB_ArrayLengthPciE] = {
+u32 RTL8192E_RADIOB_ARRAY[RTL8192E_RADIOB_ARRAY_LEN] = {
0x019, 0x00000003,
0x000, 0x000000bf,
0x001, 0x000006e0,
@@ -327,13 +327,13 @@ u32 Rtl8192PciERadioB_Array[RadioB_ArrayLengthPciE] = {
0x007, 0x00000700,
};
-u32 Rtl8192PciERadioC_Array[RadioC_ArrayLengthPciE] = {
+u32 RTL8192E_RADIOC_ARRAY[RTL8192E_RADIOC_ARRAY_LEN] = {
0x0, };
-u32 Rtl8192PciERadioD_Array[RadioD_ArrayLengthPciE] = {
+u32 RTL8192E_RADIOD_ARRAY[RTL8192E_RADIOD_ARRAY_LEN] = {
0x0, };
-u32 Rtl8192PciEMACPHY_Array[] = {
+u32 RTL8192E_MAC_ARRAY[RTL8192E_MAC_ARRAY_LEN] = {
0x03c, 0xffff0000, 0x00000f0f,
0x340, 0xffffffff, 0x161a1a1a,
0x344, 0xffffffff, 0x12121416,
@@ -342,7 +342,7 @@ u32 Rtl8192PciEMACPHY_Array[] = {
0x318, 0x00000fff, 0x00000100,
};
-u32 Rtl8192PciEMACPHY_Array_PG[] = {
+u32 RTL8192E_MAC_ARRAY_PG[RTL8192E_MAC_ARRAY_PG_LEN] = {
0x03c, 0xffff0000, 0x00000f0f,
0xe00, 0xffffffff, 0x06090909,
0xe04, 0xffffffff, 0x00030306,
@@ -355,7 +355,7 @@ u32 Rtl8192PciEMACPHY_Array_PG[] = {
0x318, 0x00000fff, 0x00000800,
};
-u32 Rtl8192PciEAGCTAB_Array[AGCTAB_ArrayLengthPciE] = {
+u32 RTL8192E_AGC_TAB_ARRAY[RTL8192E_AGC_TAB_ARRAY_LEN] = {
0xc78, 0x7d000001,
0xc78, 0x7d010001,
0xc78, 0x7d020001,
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h
index 7d63f5a5c1b7..a436c089a779 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h
@@ -11,23 +11,23 @@
#include <linux/types.h>
-#define PHY_REGArrayLengthPciE 1
-extern u32 Rtl8192PciEPHY_REGArray[PHY_REGArrayLengthPciE];
-#define PHY_REG_1T2RArrayLengthPciE 296
-extern u32 Rtl8192PciEPHY_REG_1T2RArray[PHY_REG_1T2RArrayLengthPciE];
-#define RadioA_ArrayLengthPciE 246
-extern u32 Rtl8192PciERadioA_Array[RadioA_ArrayLengthPciE];
-#define RadioB_ArrayLengthPciE 78
-extern u32 Rtl8192PciERadioB_Array[RadioB_ArrayLengthPciE];
-#define RadioC_ArrayLengthPciE 2
-extern u32 Rtl8192PciERadioC_Array[RadioC_ArrayLengthPciE];
-#define RadioD_ArrayLengthPciE 2
-extern u32 Rtl8192PciERadioD_Array[RadioD_ArrayLengthPciE];
-#define MACPHY_ArrayLengthPciE 18
-extern u32 Rtl8192PciEMACPHY_Array[MACPHY_ArrayLengthPciE];
-#define MACPHY_Array_PGLengthPciE 30
-extern u32 Rtl8192PciEMACPHY_Array_PG[MACPHY_Array_PGLengthPciE];
-#define AGCTAB_ArrayLengthPciE 384
-extern u32 Rtl8192PciEAGCTAB_Array[AGCTAB_ArrayLengthPciE];
+#define RTL8192E_PHY_REG_ARRAY_LEN 1
+extern u32 RTL8192E_PHY_REG_ARRAY[RTL8192E_PHY_REG_ARRAY_LEN];
+#define RTL8192E_PHY_REG_1T2R_ARRAY_LEN 296
+extern u32 RTL8192E_PHY_REG_1T2R_ARRAY[RTL8192E_PHY_REG_1T2R_ARRAY_LEN];
+#define RTL8192E_RADIOA_ARRAY_LEN 246
+extern u32 RTL8192E_RADIOA_ARRAY[RTL8192E_RADIOA_ARRAY_LEN];
+#define RTL8192E_RADIOB_ARRAY_LEN 78
+extern u32 RTL8192E_RADIOB_ARRAY[RTL8192E_RADIOB_ARRAY_LEN];
+#define RTL8192E_RADIOC_ARRAY_LEN 2
+extern u32 RTL8192E_RADIOC_ARRAY[RTL8192E_RADIOC_ARRAY_LEN];
+#define RTL8192E_RADIOD_ARRAY_LEN 2
+extern u32 RTL8192E_RADIOD_ARRAY[RTL8192E_RADIOD_ARRAY_LEN];
+#define RTL8192E_MAC_ARRAY_LEN 18
+extern u32 RTL8192E_MAC_ARRAY[RTL8192E_MAC_ARRAY_LEN];
+#define RTL8192E_MAC_ARRAY_PG_LEN 30
+extern u32 RTL8192E_MAC_ARRAY_PG[RTL8192E_MAC_ARRAY_PG_LEN];
+#define RTL8192E_AGC_TAB_ARRAY_LEN 384
+extern u32 RTL8192E_AGC_TAB_ARRAY[RTL8192E_AGC_TAB_ARRAY_LEN];
#endif
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h
index 75629f5df954..e1c1f19b71a3 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h
@@ -9,25 +9,25 @@
#define MAX_DOZE_WAITING_TIMES_9x 64
-#define AGCTAB_ArrayLength AGCTAB_ArrayLengthPciE
-#define MACPHY_ArrayLength MACPHY_ArrayLengthPciE
-#define RadioA_ArrayLength RadioA_ArrayLengthPciE
-#define RadioB_ArrayLength RadioB_ArrayLengthPciE
-#define MACPHY_Array_PGLength MACPHY_Array_PGLengthPciE
-#define RadioC_ArrayLength RadioC_ArrayLengthPciE
-#define RadioD_ArrayLength RadioD_ArrayLengthPciE
-#define PHY_REGArrayLength PHY_REGArrayLengthPciE
-#define PHY_REG_1T2RArrayLength PHY_REG_1T2RArrayLengthPciE
+#define AGCTAB_ArrayLength RTL8192E_AGC_TAB_ARRAY_LEN
+#define MACPHY_ArrayLength RTL8192E_MAC_ARRAY_LEN
+#define RadioA_ArrayLength RTL8192E_RADIOA_ARRAY_LEN
+#define RadioB_ArrayLength RTL8192E_RADIOB_ARRAY_LEN
+#define MACPHY_Array_PGLength RTL8192E_MAC_ARRAY_PG_LEN
+#define RadioC_ArrayLength RTL8192E_RADIOC_ARRAY_LEN
+#define RadioD_ArrayLength RTL8192E_RADIOD_ARRAY_LEN
+#define PHY_REGArrayLength RTL8192E_PHY_REG_ARRAY_LEN
+#define PHY_REG_1T2RArrayLength RTL8192E_PHY_REG_1T2R_ARRAY_LEN
-#define Rtl819XMACPHY_Array_PG Rtl8192PciEMACPHY_Array_PG
-#define Rtl819XMACPHY_Array Rtl8192PciEMACPHY_Array
-#define Rtl819XRadioA_Array Rtl8192PciERadioA_Array
-#define Rtl819XRadioB_Array Rtl8192PciERadioB_Array
-#define Rtl819XRadioC_Array Rtl8192PciERadioC_Array
-#define Rtl819XRadioD_Array Rtl8192PciERadioD_Array
-#define Rtl819XAGCTAB_Array Rtl8192PciEAGCTAB_Array
-#define Rtl819XPHY_REGArray Rtl8192PciEPHY_REGArray
-#define Rtl819XPHY_REG_1T2RArray Rtl8192PciEPHY_REG_1T2RArray
+#define Rtl819XMACPHY_Array_PG RTL8192E_MAC_ARRAY_PG
+#define Rtl819XMACPHY_Array RTL8192E_MAC_ARRAY
+#define Rtl819XRadioA_Array RTL8192E_RADIOA_ARRAY
+#define Rtl819XRadioB_Array RTL8192E_RADIOB_ARRAY
+#define Rtl819XRadioC_Array RTL8192E_RADIOC_ARRAY
+#define Rtl819XRadioD_Array RTL8192E_RADIOD_ARRAY
+#define Rtl819XAGCTAB_Array RTL8192E_AGC_TAB_ARRAY
+#define Rtl819XPHY_REGArray RTL8192E_PHY_REG_ARRAY
+#define Rtl819XPHY_REG_1T2RArray RTL8192E_PHY_REG_1T2R_ARRAY
extern u32 rtl819XAGCTAB_Array[];
--
2.34.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v2 2/3] staging: rtl8192e: rename r8192E_hwimg.c/h to table.c/h
2022-11-06 1:11 [PATCH v2 0/3] staging: rtl8192e: trivial code cleanup patches Jacob Bai
2022-11-06 1:11 ` [PATCH v2 1/3] staging: rtl8192e: rename tables in r8192e_hwimg.c Jacob Bai
@ 2022-11-06 1:11 ` Jacob Bai
2022-11-06 1:11 ` [PATCH v2 3/3] staging: rtl8192e: remove unnecesscary macro defines Jacob Bai
2 siblings, 0 replies; 7+ messages in thread
From: Jacob Bai @ 2022-11-06 1:11 UTC (permalink / raw)
To: gregkh, linux-staging, linux-kernel; +Cc: Jacob Bai
Same as other rtlwifi drivers, use table.c/h.
Signed-off-by: Jacob Bai <jacob.bai.au@gmail.com>
---
drivers/staging/rtl8192e/rtl8192e/Makefile | 2 +-
drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c | 2 +-
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 2 +-
drivers/staging/rtl8192e/rtl8192e/{r8192E_hwimg.c => table.c} | 2 +-
drivers/staging/rtl8192e/rtl8192e/{r8192E_hwimg.h => table.h} | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
rename drivers/staging/rtl8192e/rtl8192e/{r8192E_hwimg.c => table.c} (99%)
rename drivers/staging/rtl8192e/rtl8192e/{r8192E_hwimg.h => table.h} (94%)
diff --git a/drivers/staging/rtl8192e/rtl8192e/Makefile b/drivers/staging/rtl8192e/rtl8192e/Makefile
index 75e6ec510555..334d92efd4ba 100644
--- a/drivers/staging/rtl8192e/rtl8192e/Makefile
+++ b/drivers/staging/rtl8192e/rtl8192e/Makefile
@@ -4,7 +4,7 @@ r8192e_pci-objs := \
r8192E_phy.o \
r8192E_firmware.o \
r8192E_cmdpkt.o \
- r8192E_hwimg.o \
+ table.o \
r8190P_rtl8256.o \
rtl_cam.o \
rtl_core.o \
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
index 789d288d7503..45819f2f2a37 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_firmware.c
@@ -6,7 +6,7 @@
*/
#include "rtl_core.h"
#include "r8192E_hw.h"
-#include "r8192E_hwimg.h"
+#include "table.h"
#include "r8192E_firmware.h"
#include "r8192E_cmdpkt.h"
#include <linux/firmware.h>
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
index 58da2dab55bd..eabb4187d907 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
@@ -12,7 +12,7 @@
#include "r8192E_phy.h"
#include "rtl_dm.h"
-#include "r8192E_hwimg.h"
+#include "table.h"
static u32 RF_CHANNEL_TABLE_ZEBRA[] = {
0,
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c b/drivers/staging/rtl8192e/rtl8192e/table.c
similarity index 99%
rename from drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c
rename to drivers/staging/rtl8192e/rtl8192e/table.c
index 8920283f340e..2e75f40db874 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c
+++ b/drivers/staging/rtl8192e/rtl8192e/table.c
@@ -4,7 +4,7 @@
*
* Contact Information: wlanfae <wlanfae@realtek.com>
*/
-#include "r8192E_hwimg.h"
+#include "table.h"
u32 RTL8192E_PHY_REG_ARRAY[RTL8192E_PHY_REG_ARRAY_LEN] = {0x0,};
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h b/drivers/staging/rtl8192e/rtl8192e/table.h
similarity index 94%
rename from drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h
rename to drivers/staging/rtl8192e/rtl8192e/table.h
index a436c089a779..a80176c47127 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h
+++ b/drivers/staging/rtl8192e/rtl8192e/table.h
@@ -4,8 +4,8 @@
*
* Contact Information: wlanfae <wlanfae@realtek.com>
*/
-#ifndef __INC_HAL8192PciE_FW_IMG_H
-#define __INC_HAL8192PciE_FW_IMG_H
+#ifndef __RTL8192E_TABLE__H_
+#define __RTL8192E_TABLE__H_
/*Created on 2008/11/18, 3: 7*/
--
2.34.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v2 3/3] staging: rtl8192e: remove unnecesscary macro defines
2022-11-06 1:11 [PATCH v2 0/3] staging: rtl8192e: trivial code cleanup patches Jacob Bai
2022-11-06 1:11 ` [PATCH v2 1/3] staging: rtl8192e: rename tables in r8192e_hwimg.c Jacob Bai
2022-11-06 1:11 ` [PATCH v2 2/3] staging: rtl8192e: rename r8192E_hwimg.c/h to table.c/h Jacob Bai
@ 2022-11-06 1:11 ` Jacob Bai
2022-11-06 1:18 ` Joe Perches
2 siblings, 1 reply; 7+ messages in thread
From: Jacob Bai @ 2022-11-06 1:11 UTC (permalink / raw)
To: gregkh, linux-staging, linux-kernel; +Cc: Jacob Bai
remove useless macro defines
Signed-off-by: Jacob Bai <jacob.bai.au@gmail.com>
---
.../staging/rtl8192e/rtl8192e/r8192E_phy.c | 52 +++++++++----------
.../staging/rtl8192e/rtl8192e/r8192E_phy.h | 20 -------
2 files changed, 26 insertions(+), 46 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
index eabb4187d907..aad1842857c0 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
@@ -307,12 +307,12 @@ void rtl92e_config_mac(struct net_device *dev)
struct r8192_priv *priv = rtllib_priv(dev);
if (priv->bTXPowerDataReadFromEEPORM) {
- dwArrayLen = MACPHY_Array_PGLength;
- pdwArray = Rtl819XMACPHY_Array_PG;
+ dwArrayLen = RTL8192E_MAC_ARRAY_PG_LEN;
+ pdwArray = RTL8192E_MAC_ARRAY_PG;
} else {
- dwArrayLen = MACPHY_ArrayLength;
- pdwArray = Rtl819XMACPHY_Array;
+ dwArrayLen = RTL8192E_MAC_ARRAY_LEN;
+ pdwArray = RTL8192E_MAC_ARRAY;
}
for (i = 0; i < dwArrayLen; i += 3) {
if (pdwArray[i] == 0x318)
@@ -332,14 +332,14 @@ static void _rtl92e_phy_config_bb(struct net_device *dev, u8 ConfigType)
u16 AGCTAB_ArrayLen, PHY_REGArrayLen = 0;
struct r8192_priv *priv = rtllib_priv(dev);
- AGCTAB_ArrayLen = AGCTAB_ArrayLength;
- Rtl819XAGCTAB_Array_Table = Rtl819XAGCTAB_Array;
+ AGCTAB_ArrayLen = RTL8192E_AGC_TAB_ARRAY_LEN;
+ Rtl819XAGCTAB_Array_Table = RTL8192E_AGC_TAB_ARRAY;
if (priv->rf_type == RF_2T4R) {
- PHY_REGArrayLen = PHY_REGArrayLength;
- Rtl819XPHY_REGArray_Table = Rtl819XPHY_REGArray;
+ PHY_REGArrayLen = RTL8192E_PHY_REG_ARRAY_LEN;
+ Rtl819XPHY_REGArray_Table = RTL8192E_PHY_REG_ARRAY;
} else if (priv->rf_type == RF_1T2R) {
- PHY_REGArrayLen = PHY_REG_1T2RArrayLength;
- Rtl819XPHY_REGArray_Table = Rtl819XPHY_REG_1T2RArray;
+ PHY_REGArrayLen = RTL8192E_PHY_REG_1T2R_ARRAY_LEN;
+ Rtl819XPHY_REGArray_Table = RTL8192E_PHY_REG_1T2R_ARRAY;
}
if (ConfigType == BaseBand_Config_PHY_REG) {
@@ -668,50 +668,50 @@ u8 rtl92e_config_rf_path(struct net_device *dev, enum rf90_radio_path eRFPath)
switch (eRFPath) {
case RF90_PATH_A:
- for (i = 0; i < RadioA_ArrayLength; i += 2) {
- if (Rtl819XRadioA_Array[i] == 0xfe) {
+ for (i = 0; i < RTL8192E_RADIOA_ARRAY_LEN; i += 2) {
+ if (RTL8192E_RADIOA_ARRAY[i] == 0xfe) {
msleep(100);
continue;
}
- rtl92e_set_rf_reg(dev, eRFPath, Rtl819XRadioA_Array[i],
+ rtl92e_set_rf_reg(dev, eRFPath, RTL8192E_RADIOA_ARRAY[i],
bMask12Bits,
- Rtl819XRadioA_Array[i+1]);
+ RTL8192E_RADIOA_ARRAY[i+1]);
}
break;
case RF90_PATH_B:
- for (i = 0; i < RadioB_ArrayLength; i += 2) {
- if (Rtl819XRadioB_Array[i] == 0xfe) {
+ for (i = 0; i < RTL8192E_RADIOB_ARRAY_LEN; i += 2) {
+ if (RTL8192E_RADIOB_ARRAY[i] == 0xfe) {
msleep(100);
continue;
}
- rtl92e_set_rf_reg(dev, eRFPath, Rtl819XRadioB_Array[i],
+ rtl92e_set_rf_reg(dev, eRFPath, RTL8192E_RADIOB_ARRAY[i],
bMask12Bits,
- Rtl819XRadioB_Array[i+1]);
+ RTL8192E_RADIOB_ARRAY[i+1]);
}
break;
case RF90_PATH_C:
- for (i = 0; i < RadioC_ArrayLength; i += 2) {
- if (Rtl819XRadioC_Array[i] == 0xfe) {
+ for (i = 0; i < RTL8192E_RADIOC_ARRAY_LEN; i += 2) {
+ if (RTL8192E_RADIOC_ARRAY[i] == 0xfe) {
msleep(100);
continue;
}
- rtl92e_set_rf_reg(dev, eRFPath, Rtl819XRadioC_Array[i],
+ rtl92e_set_rf_reg(dev, eRFPath, RTL8192E_RADIOC_ARRAY[i],
bMask12Bits,
- Rtl819XRadioC_Array[i+1]);
+ RTL8192E_RADIOC_ARRAY[i+1]);
}
break;
case RF90_PATH_D:
- for (i = 0; i < RadioD_ArrayLength; i += 2) {
- if (Rtl819XRadioD_Array[i] == 0xfe) {
+ for (i = 0; i < RTL8192E_RADIOD_ARRAY_LEN; i += 2) {
+ if (RTL8192E_RADIOD_ARRAY[i] == 0xfe) {
msleep(100);
continue;
}
- rtl92e_set_rf_reg(dev, eRFPath, Rtl819XRadioD_Array[i],
+ rtl92e_set_rf_reg(dev, eRFPath, RTL8192E_RADIOD_ARRAY[i],
bMask12Bits,
- Rtl819XRadioD_Array[i+1]);
+ RTL8192E_RADIOD_ARRAY[i+1]);
}
break;
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h
index e1c1f19b71a3..5e6527e835db 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h
@@ -9,26 +9,6 @@
#define MAX_DOZE_WAITING_TIMES_9x 64
-#define AGCTAB_ArrayLength RTL8192E_AGC_TAB_ARRAY_LEN
-#define MACPHY_ArrayLength RTL8192E_MAC_ARRAY_LEN
-#define RadioA_ArrayLength RTL8192E_RADIOA_ARRAY_LEN
-#define RadioB_ArrayLength RTL8192E_RADIOB_ARRAY_LEN
-#define MACPHY_Array_PGLength RTL8192E_MAC_ARRAY_PG_LEN
-#define RadioC_ArrayLength RTL8192E_RADIOC_ARRAY_LEN
-#define RadioD_ArrayLength RTL8192E_RADIOD_ARRAY_LEN
-#define PHY_REGArrayLength RTL8192E_PHY_REG_ARRAY_LEN
-#define PHY_REG_1T2RArrayLength RTL8192E_PHY_REG_1T2R_ARRAY_LEN
-
-#define Rtl819XMACPHY_Array_PG RTL8192E_MAC_ARRAY_PG
-#define Rtl819XMACPHY_Array RTL8192E_MAC_ARRAY
-#define Rtl819XRadioA_Array RTL8192E_RADIOA_ARRAY
-#define Rtl819XRadioB_Array RTL8192E_RADIOB_ARRAY
-#define Rtl819XRadioC_Array RTL8192E_RADIOC_ARRAY
-#define Rtl819XRadioD_Array RTL8192E_RADIOD_ARRAY
-#define Rtl819XAGCTAB_Array RTL8192E_AGC_TAB_ARRAY
-#define Rtl819XPHY_REGArray RTL8192E_PHY_REG_ARRAY
-#define Rtl819XPHY_REG_1T2RArray RTL8192E_PHY_REG_1T2R_ARRAY
-
extern u32 rtl819XAGCTAB_Array[];
enum hw90_block {
--
2.34.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v2 3/3] staging: rtl8192e: remove unnecesscary macro defines
2022-11-06 1:11 ` [PATCH v2 3/3] staging: rtl8192e: remove unnecesscary macro defines Jacob Bai
@ 2022-11-06 1:18 ` Joe Perches
2022-11-06 1:31 ` Jacob Bai
0 siblings, 1 reply; 7+ messages in thread
From: Joe Perches @ 2022-11-06 1:18 UTC (permalink / raw)
To: Jacob Bai, gregkh, linux-staging, linux-kernel
On Sun, 2022-11-06 at 12:11 +1100, Jacob Bai wrote:
> remove useless macro defines
[]
> diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
> index eabb4187d907..aad1842857c0 100644
> --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
> +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
> @@ -307,12 +307,12 @@ void rtl92e_config_mac(struct net_device *dev)
> struct r8192_priv *priv = rtllib_priv(dev);
>
> if (priv->bTXPowerDataReadFromEEPORM) {
> - dwArrayLen = MACPHY_Array_PGLength;
> - pdwArray = Rtl819XMACPHY_Array_PG;
> + dwArrayLen = RTL8192E_MAC_ARRAY_PG_LEN;
> + pdwArray = RTL8192E_MAC_ARRAY_PG;
Perhaps use ARRAY_SIZE instead.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 3/3] staging: rtl8192e: remove unnecesscary macro defines
2022-11-06 1:18 ` Joe Perches
@ 2022-11-06 1:31 ` Jacob Bai
2022-11-06 1:45 ` Joe Perches
0 siblings, 1 reply; 7+ messages in thread
From: Jacob Bai @ 2022-11-06 1:31 UTC (permalink / raw)
To: Joe Perches, gregkh, linux-staging, linux-kernel
On Sat, Nov 05, 2022 at 06:18:41PM -0700, Joe Perches wrote:
> On Sun, 2022-11-06 at 12:11 +1100, Jacob Bai wrote:
> > remove useless macro defines
> []
> > diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
> > index eabb4187d907..aad1842857c0 100644
> > --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
> > +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
> > @@ -307,12 +307,12 @@ void rtl92e_config_mac(struct net_device *dev)
> > struct r8192_priv *priv = rtllib_priv(dev);
> >
> > if (priv->bTXPowerDataReadFromEEPORM) {
> > - dwArrayLen = MACPHY_Array_PGLength;
> > - pdwArray = Rtl819XMACPHY_Array_PG;
> > + dwArrayLen = RTL8192E_MAC_ARRAY_PG_LEN;
> > + pdwArray = RTL8192E_MAC_ARRAY_PG;
>
> Perhaps use ARRAY_SIZE instead.
>
As the other drivers under rtlwifi are using ARRAY_LEN or ARRAY_LENGTH,
maybe it's better to keep the same format?
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 3/3] staging: rtl8192e: remove unnecesscary macro defines
2022-11-06 1:31 ` Jacob Bai
@ 2022-11-06 1:45 ` Joe Perches
0 siblings, 0 replies; 7+ messages in thread
From: Joe Perches @ 2022-11-06 1:45 UTC (permalink / raw)
To: Jacob Bai, gregkh, linux-staging, linux-kernel
On Sun, 2022-11-06 at 12:31 +1100, Jacob Bai wrote:
> On Sat, Nov 05, 2022 at 06:18:41PM -0700, Joe Perches wrote:
> > On Sun, 2022-11-06 at 12:11 +1100, Jacob Bai wrote:
> > > remove useless macro defines
> > []
> > > diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
> > > index eabb4187d907..aad1842857c0 100644
> > > --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
> > > +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
> > > @@ -307,12 +307,12 @@ void rtl92e_config_mac(struct net_device *dev)
> > > struct r8192_priv *priv = rtllib_priv(dev);
> > >
> > > if (priv->bTXPowerDataReadFromEEPORM) {
> > > - dwArrayLen = MACPHY_Array_PGLength;
> > > - pdwArray = Rtl819XMACPHY_Array_PG;
> > > + dwArrayLen = RTL8192E_MAC_ARRAY_PG_LEN;
> > > + pdwArray = RTL8192E_MAC_ARRAY_PG;
> >
> > Perhaps use ARRAY_SIZE instead.
> >
> As the other drivers under rtlwifi are using ARRAY_LEN or ARRAY_LENGTH,
> maybe it's better to keep the same format?
Maybe it's better to use the typical kernel style.
$ git grep ARRAY_SIZE drivers/net/wireless/realtek/rtlwifi/
vs
$ git grep ARRAY_SIZE drivers/staging/rtl*
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-11-06 1:45 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-06 1:11 [PATCH v2 0/3] staging: rtl8192e: trivial code cleanup patches Jacob Bai
2022-11-06 1:11 ` [PATCH v2 1/3] staging: rtl8192e: rename tables in r8192e_hwimg.c Jacob Bai
2022-11-06 1:11 ` [PATCH v2 2/3] staging: rtl8192e: rename r8192E_hwimg.c/h to table.c/h Jacob Bai
2022-11-06 1:11 ` [PATCH v2 3/3] staging: rtl8192e: remove unnecesscary macro defines Jacob Bai
2022-11-06 1:18 ` Joe Perches
2022-11-06 1:31 ` Jacob Bai
2022-11-06 1:45 ` Joe Perches
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).