From: Michael Straube <straube.linux@gmail.com>
To: gregkh@linuxfoundation.org
Cc: Larry.Finger@lwfinger.net, phil@philpotter.co.uk,
martin@kaiser.cx, fmdefrancesco@gmail.com,
linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
Michael Straube <straube.linux@gmail.com>
Subject: [PATCH v2 07/12] staging: r8188eu: remove macro ODM_REG
Date: Sat, 18 Sep 2021 11:24:38 +0200 [thread overview]
Message-ID: <20210918092443.8724-8-straube.linux@gmail.com> (raw)
In-Reply-To: <20210918092443.8724-1-straube.linux@gmail.com>
Replace and remove the macro ODM_REG to make the code cleaner.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/hal/odm.c | 6 +++---
drivers/staging/r8188eu/include/odm_interface.h | 2 --
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/r8188eu/hal/odm.c b/drivers/staging/r8188eu/hal/odm.c
index 48c10b78f4a5..1e2deb6cdb58 100644
--- a/drivers/staging/r8188eu/hal/odm.c
+++ b/drivers/staging/r8188eu/hal/odm.c
@@ -465,7 +465,7 @@ void ODM_Write_DIG(struct odm_dm_struct *pDM_Odm, u8 CurrentIGI)
struct rtw_dig *pDM_DigTable = &pDM_Odm->DM_DigTable;
if (pDM_DigTable->CurIGValue != CurrentIGI) {
- ODM_SetBBReg(pDM_Odm, ODM_REG(IGI_A, pDM_Odm), ODM_BIT(IGI, pDM_Odm), CurrentIGI);
+ ODM_SetBBReg(pDM_Odm, ODM_REG_IGI_A_11N, ODM_BIT(IGI, pDM_Odm), CurrentIGI);
pDM_DigTable->CurIGValue = CurrentIGI;
}
}
@@ -521,7 +521,7 @@ void odm_DIGInit(struct odm_dm_struct *pDM_Odm)
{
struct rtw_dig *pDM_DigTable = &pDM_Odm->DM_DigTable;
- pDM_DigTable->CurIGValue = (u8)ODM_GetBBReg(pDM_Odm, ODM_REG(IGI_A, pDM_Odm), ODM_BIT(IGI, pDM_Odm));
+ pDM_DigTable->CurIGValue = (u8)ODM_GetBBReg(pDM_Odm, ODM_REG_IGI_A_11N, ODM_BIT(IGI, pDM_Odm));
pDM_DigTable->RssiLowThresh = DM_DIG_THRESH_LOW;
pDM_DigTable->RssiHighThresh = DM_DIG_THRESH_HIGH;
pDM_DigTable->FALowThresh = DM_false_ALARM_THRESH_LOW;
@@ -865,7 +865,7 @@ void ODM_Write_CCK_CCA_Thres(struct odm_dm_struct *pDM_Odm, u8 CurCCK_CCAThres)
struct rtw_dig *pDM_DigTable = &pDM_Odm->DM_DigTable;
if (pDM_DigTable->CurCCK_CCAThres != CurCCK_CCAThres) /* modify by Guo.Mingzhi 2012-01-03 */
- ODM_Write1Byte(pDM_Odm, ODM_REG(CCK_CCA, pDM_Odm), CurCCK_CCAThres);
+ ODM_Write1Byte(pDM_Odm, ODM_REG_CCK_CCA_11N, CurCCK_CCAThres);
pDM_DigTable->PreCCK_CCAThres = pDM_DigTable->CurCCK_CCAThres;
pDM_DigTable->CurCCK_CCAThres = CurCCK_CCAThres;
}
diff --git a/drivers/staging/r8188eu/include/odm_interface.h b/drivers/staging/r8188eu/include/odm_interface.h
index 4f35dcd0bf49..a5a7b72815f3 100644
--- a/drivers/staging/r8188eu/include/odm_interface.h
+++ b/drivers/staging/r8188eu/include/odm_interface.h
@@ -4,12 +4,10 @@
#ifndef __ODM_INTERFACE_H__
#define __ODM_INTERFACE_H__
-#define _reg_11N(_name) ODM_REG_##_name##_11N
#define _bit_11N(_name) ODM_BIT_##_name##_11N
#define _cat(_name, _func) (_func##_11N(_name))
-#define ODM_REG(_name, _pDM_Odm) _cat(_name, _reg)
#define ODM_BIT(_name, _pDM_Odm) _cat(_name, _bit)
enum odm_h2c_cmd {
--
2.33.0
next prev parent reply other threads:[~2021-09-18 9:25 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-18 9:24 [PATCH v2 00/12] staging: r8188eu: remove odm_RegDefine11AC.h Michael Straube
2021-09-18 9:24 ` [PATCH v2 01/12] staging: r8188eu: remove comments from odm_interface.h Michael Straube
2021-09-18 9:24 ` [PATCH v2 02/12] staging: r8188eu: remove unused macros " Michael Straube
2021-09-18 9:24 ` [PATCH v2 03/12] staging: r8188eu: remove _ic_type from macro _cat in odm_interface.h Michael Straube
2021-09-18 9:24 ` [PATCH v2 04/12] staging: r8188eu: remove dead code from ODM_Write_DIG() Michael Straube
2021-09-18 9:24 ` [PATCH v2 05/12] staging: r8188eu: remove unnecessary if statement Michael Straube
2021-09-18 9:24 ` [PATCH v2 06/12] staging: r8188eu: remove more dead code from ODM_Write_DIG() Michael Straube
2021-09-18 9:24 ` Michael Straube [this message]
2021-09-18 9:24 ` [PATCH v2 08/12] staging: r8188eu: remove macro ODM_BIT Michael Straube
2021-09-18 9:24 ` [PATCH v2 09/12] staging: r8188eu: remove unnecessary if statements Michael Straube
2021-09-18 9:24 ` [PATCH v2 10/12] staging: r8188eu: remove dead code from odm.c Michael Straube
2021-09-18 9:24 ` [PATCH v2 11/12] staging: r8188eu: remove macros ODM_IC_11{N,AC}_SERIES Michael Straube
2021-09-18 9:24 ` [PATCH v2 12/12] staging: r8188eu: remove header file odm_RegDefine11AC.h 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=20210918092443.8724-8-straube.linux@gmail.com \
--to=straube.linux@gmail.com \
--cc=Larry.Finger@lwfinger.net \
--cc=fmdefrancesco@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=martin@kaiser.cx \
--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