staging: r8188eu: rename some macros to upper case

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@gmail.com>
Link: https://lore.kernel.org/r/20220329202141.7028-4-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index 8e4b84f51a3c0beed2a56b8bb3e704a67f7d00f5..8dc90f9636b59711a78665fc7a43468ff5148c87 100644 (file)
--- 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 edae053e350ea1ad7d9e0a4dce878fdd383ad981..ef42c4b2f20c7156233a68947eadbb8c17d2d4fe 100644 (file)
--- 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 */