Thus wrote Michael Straube (straube.linux@xxxxxxxxx): > 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. > Signed-off-by: Michael Straube <straube.linux@xxxxxxxxx> > --- > v3: Remove INTERRUPT_MSG_FORMAT_LEN from rtl8188e_recv.h. > v2: Remove interrupt_handler_8188eu() since it does nothing now. > drivers/staging/r8188eu/hal/usb_ops_linux.c | 20 ------------------- > .../staging/r8188eu/include/rtl8188e_hal.h | 3 --- > .../staging/r8188eu/include/rtl8188e_recv.h | 1 - > .../staging/r8188eu/include/rtl8188e_spec.h | 7 ------- > 4 files changed, 31 deletions(-) > diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/r8188eu/hal/usb_ops_linux.c > index 9ec55a77dccd..4a0ab4053e90 100644 > --- 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 2ce42d647a34..239d0db55639 100644 > --- 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 bc30eb4634bb..0be9896eaf0f 100644 > --- 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 e59fd2fe82c5..009222b4a95d 100644 > --- 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) > -- > 2.34.1 Acked-by: Martin Kaiser <martin@xxxxxxxxx>