staging: r8188eu: change all num...Q variables to u8

All of numPubQ, numHQ and numLQ variables store only u8 values. Change
their types to u8. We can then simplify the REG_RQPN expression. The
macros and the temporary variable are not needed any more.

Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20220808201405.68966-4-martin@kaiser.cx
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 18465e5ce9cc1cce6cf9fdd8ccdf8c7f747bca25..25fd6b46e76d8dd86dc0063576b840cce18ba5a3 100644 (file)
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -154,11 +154,10 @@ static void _InitQueueReservedPage(struct adapter *Adapter)
 {
        struct hal_data_8188e *haldata = &Adapter->haldata;
        struct registry_priv    *pregistrypriv = &Adapter->registrypriv;
-       u32 numHQ       = 0;
-       u32 numLQ       = 0;
+       u8 numHQ = 0;
+       u8 numLQ = 0;
        u8 numNQ = 0;
-       u32 numPubQ;
-       u32 value32;
+       u8 numPubQ;
 
        if (pregistrypriv->wifi_spec) {
                if (haldata->OutEpQueueSel & TX_SELE_HQ)
@@ -176,8 +175,7 @@ static void _InitQueueReservedPage(struct adapter *Adapter)
                numPubQ = 0xA8 - numHQ - numLQ - numNQ;
 
                /*  TX DMA */
-               value32 = _HPQ(numHQ) | _LPQ(numLQ) | _PUBQ(numPubQ) | LD_RQPN;
-               rtw_write32(Adapter, REG_RQPN, value32);
+               rtw_write32(Adapter, REG_RQPN, LD_RQPN | numPubQ << 16 | numLQ << 8 | numHQ);
        } else {
                rtw_write16(Adapter, REG_RQPN_NPQ, 0x0000);/* Just follow MP Team,??? Georgia 03/28 */
                rtw_write16(Adapter, REG_RQPN_NPQ, 0x0d);

diff --git a/drivers/staging/r8188eu/include/rtl8188e_spec.h b/drivers/staging/r8188eu/include/rtl8188e_spec.h
index d9a85fd13230199ef098a488e840f155aa6215d5..011da538df5f2921b844c5199ca39558e637338f 100644 (file)
--- a/drivers/staging/r8188eu/include/rtl8188e_spec.h
+++ b/drivers/staging/r8188eu/include/rtl8188e_spec.h
@@ -924,10 +924,6 @@ Current IOREG MAP
 #define _LLT_OP_VALUE(x)               (((x) >> 30) & 0x3)
 
 /*     0x0200h ~ 0x027Fh       TXDMA Configuration */
-/* 2RQPN */
-#define _HPQ(x)                                ((x) & 0xFF)
-#define _LPQ(x)                                (((x) & 0xFF) << 8)
-#define _PUBQ(x)                       (((x) & 0xFF) << 16)
 
 #define HPQ_PUBLIC_DIS                 BIT(24)
 #define LPQ_PUBLIC_DIS                 BIT(25)