staging: r8188eu: IntArray and C2hArray are set but never used

The fields IntArray and C2hArray of struct hal_data_8188e are set but
never used. Remove them and remove interrupt_handler_8188eu() since it
does nothing now.

While at it, remove the unsed defines USB_INTR_CONTENT_CPWM1_OFFSET
and USB_INTR_CONTENT_CPWM2_OFFSET as well.

Acked-by: Martin Kaiser <martin@kaiser.cx>
Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20220101084937.3411-7-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/r8188eu/hal/usb_ops_linux.c
index 9ec55a77dccd4717963f7271e8b8e0065cd28b1c..4a0ab4053e90b4c2e2622446b39825a6fa6b306d 100644 (file)
--- a/drivers/staging/r8188eu/hal/usb_ops_linux.c
+++ b/drivers/staging/r8188eu/hal/usb_ops_linux.c
@@ -183,24 +183,6 @@ int rtw_writeN(struct adapter *adapter, u32 addr, u32 length, u8 *data)
        return RTW_STATUS_CODE(ret);
 }
 
-static void interrupt_handler_8188eu(struct adapter *adapt, u16 pkt_len, u8 *pbuf)
-{
-       struct hal_data_8188e *haldata = &adapt->haldata;
-
-       if (pkt_len != INTERRUPT_MSG_FORMAT_LEN) {
-               DBG_88E("%s Invalid interrupt content length (%d)!\n", __func__, pkt_len);
-               return;
-       }
-
-       /*  HISR */
-       memcpy(&haldata->IntArray[0], &pbuf[USB_INTR_CONTENT_HISR_OFFSET], 4);
-       memcpy(&haldata->IntArray[1], &pbuf[USB_INTR_CONTENT_HISRE_OFFSET], 4);
-
-       /*  C2H Event */
-       if (pbuf[0] != 0)
-               memcpy(&haldata->C2hArray[0], &pbuf[USB_INTR_CONTENT_C2H_OFFSET], 16);
-}
-
 static int recvbuf2recvframe(struct adapter *adapt, struct sk_buff *pskb)
 {
        u8      *pbuf;
@@ -342,8 +324,6 @@ static int recvbuf2recvframe(struct adapter *adapt, struct sk_buff *pskb)
                                                        pattrib->MacIDValidEntry[0],
                                                        pattrib->MacIDValidEntry[1]
                                                        );
-                       } else if (pattrib->pkt_rpt_type == HIS_REPORT) {
-                               interrupt_handler_8188eu(adapt, pattrib->pkt_len, precvframe->rx_data);
                        }
                        rtw_free_recvframe(precvframe, pfree_recv_queue);
                }

diff --git a/drivers/staging/r8188eu/include/rtl8188e_hal.h b/drivers/staging/r8188eu/include/rtl8188e_hal.h
index 2ce42d647a34abee04466036b59233201297ad48..239d0db55639dcccc911a9297ac046acdae38a17 100644 (file)
--- a/drivers/staging/r8188eu/include/rtl8188e_hal.h
+++ b/drivers/staging/r8188eu/include/rtl8188e_hal.h
@@ -246,9 +246,6 @@ struct hal_data_8188e {
 
        u32     UsbBulkOutSize;
 
-       /*  Interrupt relatd register information. */
-       u32     IntArray[3];/* HISR0,HISR1,HSISR */
-       u8      C2hArray[16];
        u8      UsbTxAggMode;
        u8      UsbTxAggDescNum;
 

diff --git a/drivers/staging/r8188eu/include/rtl8188e_recv.h b/drivers/staging/r8188eu/include/rtl8188e_recv.h
index bc30eb4634bb27e0b6fa272809b281d7da87291b..0be9896eaf0f56a0c4e982d1a672a00af9811288 100644 (file)
--- a/drivers/staging/r8188eu/include/rtl8188e_recv.h
+++ b/drivers/staging/r8188eu/include/rtl8188e_recv.h
@@ -37,7 +37,6 @@ enum rx_packet_type {
        HIS_REPORT,/*  USB HISR RPT */
 };
 
-#define INTERRUPT_MSG_FORMAT_LEN 60
 void rtl8188eu_init_recvbuf(struct recv_buf *buf);
 s32 rtl8188eu_init_recv_priv(struct adapter *padapter);
 void rtl8188eu_free_recv_priv(struct adapter * padapter);

diff --git a/drivers/staging/r8188eu/include/rtl8188e_spec.h b/drivers/staging/r8188eu/include/rtl8188e_spec.h
index e59fd2fe82c5c136c02d6da2b6c43d3f832ecac2..009222b4a95de7bf98ee6d1cc657cd8978c37779 100644 (file)
--- a/drivers/staging/r8188eu/include/rtl8188e_spec.h
+++ b/drivers/staging/r8188eu/include/rtl8188e_spec.h
@@ -475,13 +475,6 @@ Default: 00b.
 #define        MSR_INFRA                       0x02
 #define        MSR_AP                          0x03
 
-/*   88EU (MSR) Media Status Register  (Offset 0x4C, 8 bits) */
-#define        USB_INTR_CONTENT_C2H_OFFSET     0
-#define        USB_INTR_CONTENT_CPWM1_OFFSET   16
-#define        USB_INTR_CONTENT_CPWM2_OFFSET   20
-#define        USB_INTR_CONTENT_HISR_OFFSET    48
-#define        USB_INTR_CONTENT_HISRE_OFFSET   52
-
 /*  88E Driver Initialization Offload REG_FDHM0(Offset 0x88, 8 bits) */
 /* IOL config for REG_FDHM0(Reg0x88) */
 #define CMD_INIT_LLT                   BIT(0)