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 08/12] staging: r8188eu: remove macro ODM_BIT
Date: Sat, 18 Sep 2021 11:24:39 +0200 [thread overview]
Message-ID: <20210918092443.8724-9-straube.linux@gmail.com> (raw)
In-Reply-To: <20210918092443.8724-1-straube.linux@gmail.com>
Replace and remove the macro ODM_BIT to make the code cleaner.
Signed-off-by: Michael Straube <straube.linux@gmail.com>
---
drivers/staging/r8188eu/hal/odm.c | 4 ++--
drivers/staging/r8188eu/include/odm_interface.h | 6 ------
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/r8188eu/hal/odm.c b/drivers/staging/r8188eu/hal/odm.c
index 1e2deb6cdb58..cb27edf657d9 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_11N, ODM_BIT(IGI, pDM_Odm), CurrentIGI);
+ ODM_SetBBReg(pDM_Odm, ODM_REG_IGI_A_11N, ODM_BIT_IGI_11N, 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_11N, ODM_BIT(IGI, pDM_Odm));
+ pDM_DigTable->CurIGValue = (u8)ODM_GetBBReg(pDM_Odm, ODM_REG_IGI_A_11N, ODM_BIT_IGI_11N);
pDM_DigTable->RssiLowThresh = DM_DIG_THRESH_LOW;
pDM_DigTable->RssiHighThresh = DM_DIG_THRESH_HIGH;
pDM_DigTable->FALowThresh = DM_false_ALARM_THRESH_LOW;
diff --git a/drivers/staging/r8188eu/include/odm_interface.h b/drivers/staging/r8188eu/include/odm_interface.h
index a5a7b72815f3..3af58e853828 100644
--- a/drivers/staging/r8188eu/include/odm_interface.h
+++ b/drivers/staging/r8188eu/include/odm_interface.h
@@ -4,12 +4,6 @@
#ifndef __ODM_INTERFACE_H__
#define __ODM_INTERFACE_H__
-#define _bit_11N(_name) ODM_BIT_##_name##_11N
-
-#define _cat(_name, _func) (_func##_11N(_name))
-
-#define ODM_BIT(_name, _pDM_Odm) _cat(_name, _bit)
-
enum odm_h2c_cmd {
ODM_H2C_RSSI_REPORT = 0,
ODM_H2C_PSD_RESULT= 1,
--
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 ` [PATCH v2 07/12] staging: r8188eu: remove macro ODM_REG Michael Straube
2021-09-18 9:24 ` Michael Straube [this message]
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-9-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.