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.
Signed-off-by: Martin Kaiser <martin@xxxxxxxxx>
---
drivers/staging/r8188eu/hal/usb_halinit.c | 7 ++-----
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;
--
2.30.2
