[PATCH v2 3/8] staging: r8188eu: rename some macros to upper case

From: Michael Straube
Date: Tue Mar 29 2022 - 16:22:13 EST


Rename some macros to upper case to avoid camel case and improve
readability. While at it, remove some unused macros.

Signed-off-by: Michael Straube <straube.linux@xxxxxxxxx>
---
v2: no changes

drivers/staging/r8188eu/hal/usb_halinit.c | 12 ++++++------
drivers/staging/r8188eu/include/rtl8188e_spec.h | 10 +++-------
2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index 8e4b84f51a3c..8dc90f9636b5 100644
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -1148,19 +1148,19 @@ void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8 *val)
AcmCtrl = AcmCtrl | 0x1;

if (acm_ctrl & BIT(3))
- AcmCtrl |= AcmHw_VoqEn;
+ AcmCtrl |= ACMHW_VOQEN;
else
- AcmCtrl &= (~AcmHw_VoqEn);
+ AcmCtrl &= (~ACMHW_VOQEN);

if (acm_ctrl & BIT(2))
- AcmCtrl |= AcmHw_ViqEn;
+ AcmCtrl |= ACMHW_VIQEN;
else
- AcmCtrl &= (~AcmHw_ViqEn);
+ AcmCtrl &= (~ACMHW_VIQEN);

if (acm_ctrl & BIT(1))
- AcmCtrl |= AcmHw_BeqEn;
+ AcmCtrl |= ACMHW_BEQEN;
else
- AcmCtrl &= (~AcmHw_BeqEn);
+ AcmCtrl &= (~ACMHW_BEQEN);

rtw_write8(Adapter, REG_ACMHWCTRL, AcmCtrl);
}
diff --git a/drivers/staging/r8188eu/include/rtl8188e_spec.h b/drivers/staging/r8188eu/include/rtl8188e_spec.h
index edae053e350e..ef42c4b2f20c 100644
--- a/drivers/staging/r8188eu/include/rtl8188e_spec.h
+++ b/drivers/staging/r8188eu/include/rtl8188e_spec.h
@@ -998,13 +998,9 @@ Current IOREG MAP
#define STOP_BCNQ BIT(6)

/* 2 ACMHWCTRL */
-#define AcmHw_HwEn BIT(0)
-#define AcmHw_BeqEn BIT(1)
-#define AcmHw_ViqEn BIT(2)
-#define AcmHw_VoqEn BIT(3)
-#define AcmHw_BeqStatus BIT(4)
-#define AcmHw_ViqStatus BIT(5)
-#define AcmHw_VoqStatus BIT(6)
+#define ACMHW_BEQEN BIT(1)
+#define ACMHW_VIQEN BIT(2)
+#define ACMHW_VOQEN BIT(3)

/* 0x0600h ~ 0x07FFh WMAC Configuration */
/* 2APSD_CTRL */
--
2.35.1