staging: r8188eu: we always use HQ and NQ for two endpoints
authorMartin Kaiser <martin@kaiser.cx>
Sat, 6 Aug 2022 19:55:39 +0000 (21:55 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 16 Aug 2022 13:17:58 +0000 (15:17 +0200)
When _InitNormalChipTwoOutEpPriority is called, pdvobjpriv->RtNumOutPipes
and haldata->OutEpQueueSel have already been initialized.

_InitNormalChipTwoOutEpPriority is called only if
pdvobjpriv->RtNumOutPipes == 2. In this case, haldata->OutEpQueueSel is
always TX_SELE_HQ | TX_SELE_NQ.

Remove the switch-case statement and set valueHi and valueLow 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-13-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/r8188eu/hal/usb_halinit.c

index a89db93..fc4d25b 100644 (file)
@@ -227,28 +227,10 @@ static void _InitNormalChipRegPriority(struct adapter *Adapter, u16 beQ,
 
 static void _InitNormalChipTwoOutEpPriority(struct adapter *Adapter)
 {
-       struct hal_data_8188e *haldata = &Adapter->haldata;
        struct registry_priv *pregistrypriv = &Adapter->registrypriv;
        u16 beQ, bkQ, viQ, voQ, mgtQ, hiQ;
-       u16 valueHi = 0;
-       u16 valueLow = 0;
-
-       switch (haldata->OutEpQueueSel) {
-       case (TX_SELE_HQ | TX_SELE_LQ):
-               valueHi = QUEUE_HIGH;
-               valueLow = QUEUE_LOW;
-               break;
-       case (TX_SELE_NQ | TX_SELE_LQ):
-               valueHi = QUEUE_NORMAL;
-               valueLow = QUEUE_LOW;
-               break;
-       case (TX_SELE_HQ | TX_SELE_NQ):
-               valueHi = QUEUE_HIGH;
-               valueLow = QUEUE_NORMAL;
-               break;
-       default:
-               break;
-       }
+       u16 valueHi = QUEUE_HIGH;
+       u16 valueLow = QUEUE_NORMAL;
 
        if (!pregistrypriv->wifi_spec) {
                beQ     = valueLow;