From: Philipp Hortmann <philipp.g.hortmann@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: [PATCH 10/12] staging: rtl8192e: Join constants Rtl819XRadioB_.. with ..RadioB_..
Date: Tue, 14 Mar 2023 19:44:07 +0100 [thread overview]
Message-ID: <59af481400d5f7633bcaf7fcd95b7e5f0093fd3f.1678814935.git.philipp.g.hortmann@gmail.com> (raw)
In-Reply-To: <cover.1678814935.git.philipp.g.hortmann@gmail.com>
Join constants Rtl819XRadioB_Array with Rtl8192PciERadioB_Array to
RTL8192E_RADIO_B_ARR to improve readability. Fix spaces around '+' to
improve coding style.
Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
---
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 6 +++---
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 1 -
drivers/staging/rtl8192e/rtl8192e/table.c | 2 +-
drivers/staging/rtl8192e/rtl8192e/table.h | 2 +-
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
index 49fdaacb788a..5b9a1b78c35e 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c
@@ -555,13 +555,13 @@ u8 rtl92e_config_rf_path(struct net_device *dev, enum rf90_radio_path eRFPath)
break;
case RF90_PATH_B:
for (i = 0; i < RTL8192E_RADIO_B_ARR_LEN; i += 2) {
- if (Rtl819XRadioB_Array[i] == 0xfe) {
+ if (RTL8192E_RADIO_B_ARR[i] == 0xfe) {
msleep(100);
continue;
}
- rtl92e_set_rf_reg(dev, eRFPath, Rtl819XRadioB_Array[i],
+ rtl92e_set_rf_reg(dev, eRFPath, RTL8192E_RADIO_B_ARR[i],
bMask12Bits,
- Rtl819XRadioB_Array[i+1]);
+ RTL8192E_RADIO_B_ARR[i + 1]);
}
break;
diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h
index 74c7850e514c..ee91d687de9b 100644
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h
@@ -9,7 +9,6 @@
#define MAX_DOZE_WAITING_TIMES_9x 64
-#define Rtl819XRadioB_Array Rtl8192PciERadioB_Array
#define Rtl819XAGCTAB_Array Rtl8192PciEAGCTAB_Array
#define Rtl819XPHY_REG_1T2RArray Rtl8192PciEPHY_REG_1T2RArray
diff --git a/drivers/staging/rtl8192e/rtl8192e/table.c b/drivers/staging/rtl8192e/rtl8192e/table.c
index 4f36a480f6f2..eeea01681e7d 100644
--- a/drivers/staging/rtl8192e/rtl8192e/table.c
+++ b/drivers/staging/rtl8192e/rtl8192e/table.c
@@ -283,7 +283,7 @@ u32 RTL8192E_RADIO_A_ARR[RTL8192E_RADIO_A_ARR_LEN] = {
0x007, 0x00000700,
};
-u32 Rtl8192PciERadioB_Array[RTL8192E_RADIO_B_ARR_LEN] = {
+u32 RTL8192E_RADIO_B_ARR[RTL8192E_RADIO_B_ARR_LEN] = {
0x019, 0x00000003,
0x000, 0x000000bf,
0x001, 0x000006e0,
diff --git a/drivers/staging/rtl8192e/rtl8192e/table.h b/drivers/staging/rtl8192e/rtl8192e/table.h
index 60917c95842b..3023440db58b 100644
--- a/drivers/staging/rtl8192e/rtl8192e/table.h
+++ b/drivers/staging/rtl8192e/rtl8192e/table.h
@@ -16,7 +16,7 @@ extern u32 Rtl8192PciEPHY_REG_1T2RArray[RTL8192E_PHY_REG_1T2R_ARR_LEN];
#define RTL8192E_RADIO_A_ARR_LEN 246
extern u32 RTL8192E_RADIO_A_ARR[RTL8192E_RADIO_A_ARR_LEN];
#define RTL8192E_RADIO_B_ARR_LEN 78
-extern u32 Rtl8192PciERadioB_Array[RTL8192E_RADIO_B_ARR_LEN];
+extern u32 RTL8192E_RADIO_B_ARR[RTL8192E_RADIO_B_ARR_LEN];
#define RTL8192E_MACPHY_ARR_LEN 18
extern u32 RTL8192E_MACPHY_ARR[RTL8192E_MACPHY_ARR_LEN];
#define RTL8192E_MACPHY_ARR_PG_LEN 30
--
2.39.2
next prev parent reply other threads:[~2023-03-14 18:44 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-14 18:42 [PATCH 00/12] staging: rtl8192e: Join constants in r8192E_phy.h Philipp Hortmann
2023-03-14 18:42 ` [PATCH 01/12] staging: rtl8192e: Join constants AGCTAB_ArrayLength with ..LengthPciE Philipp Hortmann
2023-03-14 18:43 ` [PATCH 02/12] staging: rtl8192e: Join constants MACPHY_ArrayLength " Philipp Hortmann
2023-03-14 18:43 ` [PATCH 03/12] staging: rtl8192e: Join constants RadioA_ArrayLength " Philipp Hortmann
2023-03-14 18:43 ` [PATCH 04/12] staging: rtl8192e: Join constants RadioB_ArrayLength " Philipp Hortmann
2023-03-14 18:43 ` [PATCH 05/12] staging: rtl8192e: Join constants MACPHY_Array_PGLength " Philipp Hortmann
2023-03-14 18:43 ` [PATCH 06/12] staging: rtl8192e: Join constants PHY_REG_1T2RArray.. " Philipp Hortmann
2023-03-14 18:43 ` [PATCH 07/12] staging: rtl8192e: Join constants Rtl819XMACPHY_..PG with Rtl8192PciE Philipp Hortmann
2023-03-14 18:43 ` [PATCH 08/12] staging: rtl8192e: Join constants Rtl819XMACPHY_.. " Philipp Hortmann
2023-03-14 18:43 ` [PATCH 09/12] staging: rtl8192e: Join constants Rtl819XRadioA_.. with ..RadioA_ Philipp Hortmann
2023-03-14 18:44 ` Philipp Hortmann [this message]
2023-03-14 18:44 ` [PATCH 11/12] staging: rtl8192e: Join constants Rtl819XAGCTAB_.. with ..PciEAGCTAB Philipp Hortmann
2023-03-14 18:44 ` [PATCH 12/12] staging: rtl8192e: Join constants Rtl819XPHY_REG_.. with ..PciEPHY_REG_ Philipp Hortmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=59af481400d5f7633bcaf7fcd95b7e5f0093fd3f.1678814935.git.philipp.g.hortmann@gmail.com \
--to=philipp.g.hortmann@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®