staging: r8188eu: remove _InitNormalChipOneOutEpPriority

When _InitNormalChipOneOutEpPriority is called, pdvobjpriv->RtNumOutPipes
and haldata->OutEpQueueSel have already been initialized.

_InitNormalChipOneOutEpPriority is called only if
pdvobjpriv->RtNumOutPipes == 1. In this case, haldata->OutEpQueueSel is
always TX_SELE_HQ.

We can then simplify _InitNormalChipOneOutEpPriority to a single
_InitNormalChipRegPriority call, i.e. we can remove
_InitNormalChipOneOutEpPriority and call _InitNormalChipRegPriority
directly.

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/20220806195540.777390-12-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 f3314bed9285b8fca47fa999efab87f9a5e5137f..a89db93840f3fa9ed91e44fe428044bba0730ac6 100644 (file)
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -225,28 +225,6 @@ static void _InitNormalChipRegPriority(struct adapter *Adapter, u16 beQ,
        rtw_write16(Adapter, REG_TRXDMA_CTRL, value16);
 }
 
-static void _InitNormalChipOneOutEpPriority(struct adapter *Adapter)
-{
-       struct hal_data_8188e *haldata = &Adapter->haldata;
-
-       u16 value = 0;
-       switch (haldata->OutEpQueueSel) {
-       case TX_SELE_HQ:
-               value = QUEUE_HIGH;
-               break;
-       case TX_SELE_LQ:
-               value = QUEUE_LOW;
-               break;
-       case TX_SELE_NQ:
-               value = QUEUE_NORMAL;
-               break;
-       default:
-               break;
-       }
-       _InitNormalChipRegPriority(Adapter, value, value, value, value,
-                                  value, value);
-}
-
 static void _InitNormalChipTwoOutEpPriority(struct adapter *Adapter)
 {
        struct hal_data_8188e *haldata = &Adapter->haldata;
@@ -319,7 +297,8 @@ static void _InitQueuePriority(struct adapter *Adapter)
 
        switch (pdvobjpriv->RtNumOutPipes) {
        case 1:
-               _InitNormalChipOneOutEpPriority(Adapter);
+               _InitNormalChipRegPriority(Adapter, QUEUE_HIGH, QUEUE_HIGH, QUEUE_HIGH,
+                                          QUEUE_HIGH, QUEUE_HIGH, QUEUE_HIGH);
                break;
        case 2:
                _InitNormalChipTwoOutEpPriority(Adapter);