diff options
| author | Martin Kaiser <martin@kaiser.cx> | 2022-08-06 21:55:33 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-08-16 15:17:57 +0200 |
| commit | 2ea2f91b2882bf44a64c4c13e90d3708233ba3b4 (patch) | |
| tree | fb9322b0b42d71a925f6639eb3dffa11ba849850 | |
| parent | 897155c795a8a006d9673acb15b1cc82693e0c5e (diff) | |
| download | linux-stable-2ea2f91b2882bf44a64c4c13e90d3708233ba3b4.tar.gz linux-stable-2ea2f91b2882bf44a64c4c13e90d3708233ba3b4.tar.bz2 linux-stable-2ea2f91b2882bf44a64c4c13e90d3708233ba3b4.zip | |
staging: r8188eu: remove OutEpNumber
Remove the OutEpNumber component of struct hal_data_8188e.
RtNumOutPipes in struct dvobj_priv stores the same info.
Update the only place where OutEpNumber is read.
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-7-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/r8188eu/hal/usb_halinit.c | 7 | ||||
| -rw-r--r-- | drivers/staging/r8188eu/include/rtl8188e_hal.h | 1 |
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c index 603108a5d794..664028c14141 100644 --- a/drivers/staging/r8188eu/hal/usb_halinit.c +++ b/drivers/staging/r8188eu/hal/usb_halinit.c @@ -110,17 +110,14 @@ int rtl8188eu_interface_configure(struct adapter *adapt) switch (pdvobjpriv->RtNumOutPipes) { case 3: haldata->OutEpQueueSel = TX_SELE_HQ | TX_SELE_LQ | TX_SELE_NQ; - haldata->OutEpNumber = 3; three_out_pipe(adapt, wifi_cfg); break; case 2: haldata->OutEpQueueSel = TX_SELE_HQ | TX_SELE_NQ; - haldata->OutEpNumber = 2; two_out_pipe(adapt, wifi_cfg); break; case 1: haldata->OutEpQueueSel = TX_SELE_HQ; - haldata->OutEpNumber = 1; one_out_pipe(adapt); break; default: @@ -358,9 +355,9 @@ static void _InitNormalChipThreeOutEpPriority(struct adapter *Adapter) static void _InitQueuePriority(struct adapter *Adapter) { - struct hal_data_8188e *haldata = &Adapter->haldata; + struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(Adapter); - switch (haldata->OutEpNumber) { + switch (pdvobjpriv->RtNumOutPipes) { case 1: _InitNormalChipOneOutEpPriority(Adapter); break; diff --git a/drivers/staging/r8188eu/include/rtl8188e_hal.h b/drivers/staging/r8188eu/include/rtl8188e_hal.h index fdc187f4deaa..ff0a4ce19dde 100644 --- a/drivers/staging/r8188eu/include/rtl8188e_hal.h +++ b/drivers/staging/r8188eu/include/rtl8188e_hal.h @@ -150,7 +150,6 @@ struct hal_data_8188e { u8 TRxAntDivType; u8 OutEpQueueSel; - u8 OutEpNumber; struct P2P_PS_Offload_t p2p_ps_offload; |