From: Michael Straube <straube.linux@gmail.com>
To: gregkh@linuxfoundation.org
Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
Michael Straube <straube.linux@gmail.com>
Subject: [PATCH v2 07/10] staging: r8188eu: remove duplicate defines
Date: Sun, 5 Dec 2021 18:13:39 +0100 [thread overview]
Message-ID: <20211205171342.20551-8-straube.linux@gmail.com> (raw)
In-Reply-To: <20211205171342.20551-1-straube.linux@gmail.com>
The following constants are defined in three different header files.
IQK_MAC_REG_NUM
IQK_ADDA_REG_NUM
IQK_BB_REG_NUM
HP_THERMAL_NUM
Keep them in odm.h and remove them from Hal8188EPhyCfg.h and
rtl8188e_dm.h.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/include/Hal8188EPhyCfg.h | 5 -----
drivers/staging/r8188eu/include/rtl8188e_dm.h | 7 +------
2 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/drivers/staging/r8188eu/include/Hal8188EPhyCfg.h b/drivers/staging/r8188eu/include/Hal8188EPhyCfg.h
index f4cfd11b36c1..addc6a5354a6 100644
--- a/drivers/staging/r8188eu/include/Hal8188EPhyCfg.h
+++ b/drivers/staging/r8188eu/include/Hal8188EPhyCfg.h
@@ -11,11 +11,6 @@
#define MAX_TXPWR_IDX_NMODE_92S 63
#define Reset_Cnt_Limit 3
-#define IQK_MAC_REG_NUM 4
-#define IQK_ADDA_REG_NUM 16
-#define IQK_BB_REG_NUM 9
-#define HP_THERMAL_NUM 8
-
#define MAX_AGGR_NUM 0x07
/*--------------------------Define Parameters-------------------------------*/
diff --git a/drivers/staging/r8188eu/include/rtl8188e_dm.h b/drivers/staging/r8188eu/include/rtl8188e_dm.h
index 208bea050f6f..0b3a9a1a4e5c 100644
--- a/drivers/staging/r8188eu/include/rtl8188e_dm.h
+++ b/drivers/staging/r8188eu/include/rtl8188e_dm.h
@@ -8,12 +8,7 @@ enum{
UP_LINK,
DOWN_LINK,
};
-/* duplicate code,will move to ODM ######### */
-#define IQK_MAC_REG_NUM 4
-#define IQK_ADDA_REG_NUM 16
-#define IQK_BB_REG_NUM 9
-#define HP_THERMAL_NUM 8
-/* duplicate code,will move to ODM ######### */
+
struct dm_priv {
u32 InitODMFlag;
--
2.34.1
next prev parent reply other threads:[~2021-12-05 17:14 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-05 17:13 [PATCH v2 00/10] staging: r8188eu: misc cleanups Michael Straube
2021-12-05 17:13 ` [PATCH v2 01/10] staging: r8188eu: remove RF_PATH_{C,D} Michael Straube
2021-12-05 17:13 ` [PATCH v2 02/10] staging: r8188eu: struct odm_mac_status_info is not used Michael Straube
2021-12-05 17:13 ` [PATCH v2 03/10] staging: r8188eu: remove macro PHY_SetRFReg Michael Straube
2021-12-05 17:13 ` [PATCH v2 04/10] staging: r8188eu: remove macro PHY_QueryRFReg Michael Straube
2021-12-05 17:13 ` [PATCH v2 05/10] staging: r8188eu: remove macro PHY_SetBBReg Michael Straube
2021-12-05 17:13 ` [PATCH v2 06/10] staging: r8188eu: remove macro PHY_QueryBBReg Michael Straube
2021-12-05 17:13 ` Michael Straube [this message]
2021-12-05 17:13 ` [PATCH v2 08/10] staging: r8188eu: bWIFI_Direct is set but never used Michael Straube
2021-12-05 17:13 ` [PATCH v2 09/10] staging: r8188eu: bWIFI_Display " Michael Straube
2021-12-05 17:13 ` [PATCH v2 10/10] staging: r8188eu: remove unused macro IS_FW_81xxC Michael Straube
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=20211205171342.20551-8-straube.linux@gmail.com \
--to=straube.linux@gmail.com \
--cc=Larry.Finger@lwfinger.net \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=phil@philpotter.co.uk \
/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