From e3ffbcac9d8daa94cbcee79043d4839540ab2070 Mon Sep 17 00:00:00 2001 From: Abdun Nihaal Date: Thu, 3 Mar 2022 21:21:09 +0530 Subject: [PATCH] staging: r8188eu: remove unused field pdata The field pdata in struct recv_buf is set but not used. Remove it. Also remove rtl8188eu_init_recvbuf function as it does nothing now. Signed-off-by: Abdun Nihaal Link: https://lore.kernel.org/r/7fe9ed2c6eade65c118511228283ef9d92ea4b43.1646321515.git.abdun.nihaal@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/r8188eu/hal/rtl8188eu_recv.c | 7 ------- drivers/staging/r8188eu/hal/usb_ops_linux.c | 4 ---- drivers/staging/r8188eu/include/rtl8188e_recv.h | 1 - drivers/staging/r8188eu/include/rtw_recv.h | 1 - drivers/staging/r8188eu/os_dep/recv_linux.c | 1 - 5 files changed, 14 deletions(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188eu_recv.c b/drivers/staging/r8188eu/hal/rtl8188eu_recv.c index 9f772fc7d6c16..2960e349638db 100644 --- a/drivers/staging/r8188eu/hal/rtl8188eu_recv.c +++ b/drivers/staging/r8188eu/hal/rtl8188eu_recv.c @@ -12,13 +12,6 @@ #include "../include/rtl8188e_hal.h" -void rtl8188eu_init_recvbuf(struct recv_buf *precvbuf) -{ - if (precvbuf->pbuf) { - precvbuf->pdata = precvbuf->pbuf; - } -} - int rtl8188eu_init_recv_priv(struct adapter *padapter) { struct recv_priv *precvpriv = &padapter->recvpriv; diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/r8188eu/hal/usb_ops_linux.c index f16a6bb21ab41..063bec94fd7e9 100644 --- a/drivers/staging/r8188eu/hal/usb_ops_linux.c +++ b/drivers/staging/r8188eu/hal/usb_ops_linux.c @@ -428,8 +428,6 @@ u32 rtw_read_port(struct adapter *adapter, u8 *rmem) precvbuf->reuse = true; } - rtl8188eu_init_recvbuf(precvbuf); - /* re-assign for linux based on skb */ if (!precvbuf->reuse || !precvbuf->pskb) { precvbuf->pskb = netdev_alloc_skb(adapter->pnetdev, MAX_RECVBUF_SZ + RECVBUFF_ALIGN_SZ); @@ -440,10 +438,8 @@ u32 rtw_read_port(struct adapter *adapter, u8 *rmem) alignment = tmpaddr & (RECVBUFF_ALIGN_SZ - 1); skb_reserve(precvbuf->pskb, (RECVBUFF_ALIGN_SZ - alignment)); - precvbuf->pdata = precvbuf->pskb->data; precvbuf->pbuf = precvbuf->pskb->data; } else { /* reuse skb */ - precvbuf->pdata = precvbuf->pskb->data; precvbuf->pbuf = precvbuf->pskb->data; precvbuf->reuse = false; diff --git a/drivers/staging/r8188eu/include/rtl8188e_recv.h b/drivers/staging/r8188eu/include/rtl8188e_recv.h index 87dd4152082a1..a2320af112166 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 */ }; -void rtl8188eu_init_recvbuf(struct recv_buf *buf); s32 rtl8188eu_init_recv_priv(struct adapter *padapter); void rtl8188eu_free_recv_priv(struct adapter * padapter); void rtl8188eu_recv_hdl(struct adapter * padapter, struct recv_buf *precvbuf); diff --git a/drivers/staging/r8188eu/include/rtw_recv.h b/drivers/staging/r8188eu/include/rtw_recv.h index f7bc1c9579fce..55b1bb7840c8f 100644 --- a/drivers/staging/r8188eu/include/rtw_recv.h +++ b/drivers/staging/r8188eu/include/rtw_recv.h @@ -210,7 +210,6 @@ struct recv_buf { struct adapter *adapter; u8 *pbuf; u8 *pallocated_buf; - u8 *pdata; struct urb *purb; dma_addr_t dma_transfer_addr; /* (in) dma addr for transfer_buffer */ u32 alloc_sz; diff --git a/drivers/staging/r8188eu/os_dep/recv_linux.c b/drivers/staging/r8188eu/os_dep/recv_linux.c index c8a0ac80df698..a35c78f9ae447 100644 --- a/drivers/staging/r8188eu/os_dep/recv_linux.c +++ b/drivers/staging/r8188eu/os_dep/recv_linux.c @@ -26,7 +26,6 @@ int rtw_os_recvbuf_resource_alloc(struct adapter *padapter, precvbuf->reuse = false; precvbuf->pallocated_buf = NULL; precvbuf->pbuf = NULL; - precvbuf->pdata = NULL; return res; } -- 2.30.2