staging: r8188eu: clean up struct recv_buf
cover staging: r8188eu: clean up struct recv_buf
This series removes set but unused fields from struct recv_buf.
Abdun Nihaal (9):
staging: r8188eu: remove unused field list
staging: r8188eu: remove unused field recvbuf_lock
staging: r8188eu: remove unused fields in struct recv_buf
staging: r8188eu: remove unused field phead
staging: r8188eu: remove unused field ptail
staging: r8188eu: remove unused field pend
staging: r8188eu: remove unused field pdata
staging: r8188eu: remove unneeded field pbuf
staging: r8188eu: remove unused fields in struct recv_buf
drivers/staging/r8188eu/hal/rtl8188eu_recv.c | 20 ------------------- drivers/staging/r8188eu/hal/usb_ops_linux.c | 17 +--------------- .../staging/r8188eu/include/rtl8188e_recv.h | 1 - drivers/staging/r8188eu/include/rtw_recv.h | 14 ------------- drivers/staging/r8188eu/os_dep/recv_linux.c | 9 --------- 5 files changed, 1 insertion(+), 60 deletions(-)
Signature · 1 line
2.35.1
PATCH 1/9 staging: r8188eu: remove unused field list
The field list in struct recv_buf is initialized but not used. Remove it.
--- drivers/staging/r8188eu/hal/rtl8188eu_recv.c | 1 - drivers/staging/r8188eu/include/rtw_recv.h | 1 - 2 files changed, 2 deletions(-)
drivers/staging/r8188eu/hal/rtl8188eu_recv.c +0 -1
@@ -54,7 +54,6 @@ int rtl8188eu_init_recv_priv(struct adapter *padapter) precvbuf = (struct recv_buf *)precvpriv->precv_buf;for (i =0 ; i <NR_RECVBUFF ; i++) { -INIT_LIST_HEAD (&precvbuf->list);spin_lock_init (&precvbuf->recvbuf_lock); precvbuf->alloc_sz =MAX_RECVBUF_SZ ; res =rtw_os_recvbuf_resource_alloc (padapter, precvbuf);
drivers/staging/r8188eu/include/rtw_recv.h +0 -1
@@ -207,7 +207,6 @@ struct sta_recv_priv { };struct recv_buf { -struct list_head list;spinlock_t recvbuf_lock;u32 ref_cnt;struct adapter *adapter;
Signature · 1 line
2.35.1
PATCH 2/9 staging: r8188eu: remove unused field recvbuf_lock
In reply to Abdun NihaalThe spinlock field recvbuf_lock in struct recv_buf is initialized but not used. Remove it.
--- drivers/staging/r8188eu/hal/rtl8188eu_recv.c | 1 - drivers/staging/r8188eu/include/rtw_recv.h | 1 - 2 files changed, 2 deletions(-)
drivers/staging/r8188eu/hal/rtl8188eu_recv.c +0 -1
@@ -54,7 +54,6 @@ int rtl8188eu_init_recv_priv(struct adapter *padapter) precvbuf = (struct recv_buf *)precvpriv->precv_buf;for (i =0 ; i <NR_RECVBUFF ; i++) { -spin_lock_init (&precvbuf->recvbuf_lock); precvbuf->alloc_sz =MAX_RECVBUF_SZ ; res =rtw_os_recvbuf_resource_alloc (padapter, precvbuf);if (res == _FAIL)
drivers/staging/r8188eu/include/rtw_recv.h +0 -1
@@ -207,7 +207,6 @@ struct sta_recv_priv { };struct recv_buf { -spinlock_t recvbuf_lock;u32 ref_cnt;struct adapter *adapter;u8 *pbuf;
Signature · 1 line
2.35.1
PATCH 3/9 staging: r8188eu: remove unused fields in struct recv_buf
In reply to Abdun NihaalThe fields len, ref_cnt and transfer_len in struct recv_buf are set but not used. Remove them.
--- drivers/staging/r8188eu/hal/rtl8188eu_recv.c | 7 ------- drivers/staging/r8188eu/hal/usb_ops_linux.c | 1 - drivers/staging/r8188eu/include/rtw_recv.h | 3 --- drivers/staging/r8188eu/os_dep/recv_linux.c | 2 -- 4 files changed, 13 deletions(-)
drivers/staging/r8188eu/hal/rtl8188eu_recv.c +0 -7
@@ -14,12 +14,6 @@void rtl8188eu_init_recvbuf (struct recv_buf *precvbuf) { - precvbuf->transfer_len =0 ; - - precvbuf->len =0 ; - - precvbuf->ref_cnt =0 ; -if (precvbuf->pbuf) { precvbuf->pdata = precvbuf->pbuf; precvbuf->phead = precvbuf->pbuf;
@@ -58,7 +52,6 @@ int rtl8188eu_init_recv_priv(struct adapter *padapter) res =rtw_os_recvbuf_resource_alloc (padapter, precvbuf);if (res == _FAIL)break ; - precvbuf->ref_cnt =0 ; precvbuf->adapter = padapter; precvbuf++; }
drivers/staging/r8188eu/hal/usb_ops_linux.c +0 -1
@@ -364,7 +364,6 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs) }else {rtw_reset_continual_urb_error (adapter_to_dvobj (adapt)); - precvbuf->transfer_len = purb->actual_length;skb_put (precvbuf->pskb, purb->actual_length);skb_queue_tail (&precvpriv->rx_skb_queue, precvbuf->pskb);
drivers/staging/r8188eu/include/rtw_recv.h +0 -3
@@ -207,11 +207,9 @@ struct sta_recv_priv { };struct recv_buf { -u32 ref_cnt;struct adapter *adapter;u8 *pbuf;u8 *pallocated_buf; -u32 len;u8 *phead;u8 *pdata;u8 *ptail;
@@ -220,7 +218,6 @@ struct recv_buf {dma_addr_t dma_transfer_addr;/* (in) dma addr for transfer_buffer */ u32 alloc_sz;u8 irp_pending; -int transfer_len;struct sk_buff *pskb;u8 reuse; };
drivers/staging/r8188eu/os_dep/recv_linux.c +0 -2
@@ -30,8 +30,6 @@ int rtw_os_recvbuf_resource_alloc(struct adapter *padapter, precvbuf->phead =NULL ; precvbuf->ptail =NULL ; precvbuf->pend =NULL ; - precvbuf->transfer_len =0 ; - precvbuf->len =0 ;return res; }
Signature · 1 line
2.35.1
PATCH 4/9 staging: r8188eu: remove unused field phead
In reply to Abdun NihaalThe field phead in struct recv_buf is set but not used. Remove it.
--- drivers/staging/r8188eu/hal/rtl8188eu_recv.c | 1 - drivers/staging/r8188eu/hal/usb_ops_linux.c | 2 -- drivers/staging/r8188eu/include/rtw_recv.h | 1 - drivers/staging/r8188eu/os_dep/recv_linux.c | 1 - 4 files changed, 5 deletions(-)
drivers/staging/r8188eu/hal/rtl8188eu_recv.c +0 -1
@@ -16,7 +16,6 @@ void rtl8188eu_init_recvbuf(struct recv_buf *precvbuf) {if (precvbuf->pbuf) { precvbuf->pdata = precvbuf->pbuf; - precvbuf->phead = precvbuf->pbuf; precvbuf->ptail = precvbuf->pbuf; precvbuf->pend = precvbuf->pdata +MAX_RECVBUF_SZ ; }
drivers/staging/r8188eu/hal/usb_ops_linux.c +0 -2
@@ -440,13 +440,11 @@ u32 rtw_read_port(struct adapter *adapter, u8 *rmem) alignment = tmpaddr & (RECVBUFF_ALIGN_SZ -1 );skb_reserve (precvbuf->pskb, (RECVBUFF_ALIGN_SZ - alignment)); - precvbuf->phead = precvbuf->pskb->head; precvbuf->pdata = precvbuf->pskb->data; precvbuf->ptail =skb_tail_pointer (precvbuf->pskb); precvbuf->pend =skb_end_pointer (precvbuf->pskb); precvbuf->pbuf = precvbuf->pskb->data; }else {/* reuse skb */ - precvbuf->phead = precvbuf->pskb->head; precvbuf->pdata = precvbuf->pskb->data; precvbuf->ptail =skb_tail_pointer (precvbuf->pskb); precvbuf->pend =skb_end_pointer (precvbuf->pskb);
drivers/staging/r8188eu/include/rtw_recv.h +0 -1
@@ -210,7 +210,6 @@ struct recv_buf {struct adapter *adapter;u8 *pbuf;u8 *pallocated_buf; -u8 *phead;u8 *pdata;u8 *ptail;u8 *pend;
drivers/staging/r8188eu/os_dep/recv_linux.c +0 -1
@@ -27,7 +27,6 @@ int rtw_os_recvbuf_resource_alloc(struct adapter *padapter, precvbuf->pallocated_buf =NULL ; precvbuf->pbuf =NULL ; precvbuf->pdata =NULL ; - precvbuf->phead =NULL ; precvbuf->ptail =NULL ; precvbuf->pend =NULL ;return res;
Signature · 1 line
2.35.1
PATCH 5/9 staging: r8188eu: remove unused field ptail
In reply to Abdun NihaalThe field ptail in struct recv_buf is set but not used. Remove it.
--- drivers/staging/r8188eu/hal/rtl8188eu_recv.c | 1 - drivers/staging/r8188eu/hal/usb_ops_linux.c | 2 -- drivers/staging/r8188eu/include/rtw_recv.h | 1 - drivers/staging/r8188eu/os_dep/recv_linux.c | 1 - 4 files changed, 5 deletions(-)
drivers/staging/r8188eu/hal/rtl8188eu_recv.c +0 -1
@@ -16,7 +16,6 @@ void rtl8188eu_init_recvbuf(struct recv_buf *precvbuf) {if (precvbuf->pbuf) { precvbuf->pdata = precvbuf->pbuf; - precvbuf->ptail = precvbuf->pbuf; precvbuf->pend = precvbuf->pdata +MAX_RECVBUF_SZ ; } }
drivers/staging/r8188eu/hal/usb_ops_linux.c +0 -2
@@ -441,12 +441,10 @@ u32 rtw_read_port(struct adapter *adapter, u8 *rmem)skb_reserve (precvbuf->pskb, (RECVBUFF_ALIGN_SZ - alignment)); precvbuf->pdata = precvbuf->pskb->data; - precvbuf->ptail =skb_tail_pointer (precvbuf->pskb); precvbuf->pend =skb_end_pointer (precvbuf->pskb); precvbuf->pbuf = precvbuf->pskb->data; }else {/* reuse skb */ precvbuf->pdata = precvbuf->pskb->data; - precvbuf->ptail =skb_tail_pointer (precvbuf->pskb); precvbuf->pend =skb_end_pointer (precvbuf->pskb); precvbuf->pbuf = precvbuf->pskb->data;
drivers/staging/r8188eu/include/rtw_recv.h +0 -1
@@ -211,7 +211,6 @@ struct recv_buf {u8 *pbuf;u8 *pallocated_buf;u8 *pdata; -u8 *ptail;u8 *pend;struct urb *purb;dma_addr_t dma_transfer_addr;/* (in) dma addr for transfer_buffer */
drivers/staging/r8188eu/os_dep/recv_linux.c +0 -1
@@ -27,7 +27,6 @@ int rtw_os_recvbuf_resource_alloc(struct adapter *padapter, precvbuf->pallocated_buf =NULL ; precvbuf->pbuf =NULL ; precvbuf->pdata =NULL ; - precvbuf->ptail =NULL ; precvbuf->pend =NULL ;return res; }
Signature · 1 line
2.35.1
PATCH 6/9 staging: r8188eu: remove unused field pend
In reply to Abdun NihaalThe field pend in struct recv_buf is set but not used. Remove it.
--- drivers/staging/r8188eu/hal/rtl8188eu_recv.c | 1 - drivers/staging/r8188eu/hal/usb_ops_linux.c | 2 -- drivers/staging/r8188eu/include/rtw_recv.h | 1 - drivers/staging/r8188eu/os_dep/recv_linux.c | 1 - 4 files changed, 5 deletions(-)
drivers/staging/r8188eu/hal/rtl8188eu_recv.c +0 -1
@@ -16,7 +16,6 @@ void rtl8188eu_init_recvbuf(struct recv_buf *precvbuf) {if (precvbuf->pbuf) { precvbuf->pdata = precvbuf->pbuf; - precvbuf->pend = precvbuf->pdata +MAX_RECVBUF_SZ ; } }
drivers/staging/r8188eu/hal/usb_ops_linux.c +0 -2
@@ -441,11 +441,9 @@ u32 rtw_read_port(struct adapter *adapter, u8 *rmem)skb_reserve (precvbuf->pskb, (RECVBUFF_ALIGN_SZ - alignment)); precvbuf->pdata = precvbuf->pskb->data; - precvbuf->pend =skb_end_pointer (precvbuf->pskb); precvbuf->pbuf = precvbuf->pskb->data; }else {/* reuse skb */ precvbuf->pdata = precvbuf->pskb->data; - precvbuf->pend =skb_end_pointer (precvbuf->pskb); precvbuf->pbuf = precvbuf->pskb->data; precvbuf->reuse = false;
drivers/staging/r8188eu/include/rtw_recv.h +0 -1
@@ -211,7 +211,6 @@ struct recv_buf {u8 *pbuf;u8 *pallocated_buf;u8 *pdata; -u8 *pend;struct urb *purb;dma_addr_t dma_transfer_addr;/* (in) dma addr for transfer_buffer */ u32 alloc_sz;
drivers/staging/r8188eu/os_dep/recv_linux.c +0 -1
@@ -27,7 +27,6 @@ int rtw_os_recvbuf_resource_alloc(struct adapter *padapter, precvbuf->pallocated_buf =NULL ; precvbuf->pbuf =NULL ; precvbuf->pdata =NULL ; - precvbuf->pend =NULL ;return res; }
Signature · 1 line
2.35.1
PATCH 7/9 staging: r8188eu: remove unused field pdata
In reply to Abdun NihaalThe field pdata in struct recv_buf is set but not used. Remove it.
Also remove rtl8188eu_init_recvbuf function as it does nothing now.
--- 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(-)
drivers/staging/r8188eu/hal/rtl8188eu_recv.c +0 -7
@@ -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;
drivers/staging/r8188eu/hal/usb_ops_linux.c +0 -4
@@ -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;
drivers/staging/r8188eu/include/rtl8188e_recv.h +0 -1
@@ -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);
drivers/staging/r8188eu/include/rtw_recv.h +0 -1
@@ -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;
drivers/staging/r8188eu/os_dep/recv_linux.c +0 -1
@@ -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; }
Signature · 1 line
2.35.1
PATCH 8/9 staging: r8188eu: remove unneeded field pbuf
In reply to Abdun NihaalThe field pbuf in struct recv_buf can be removed as it can be replaced with pskb->data. Remove pbuf field.
--- drivers/staging/r8188eu/hal/usb_ops_linux.c | 6 +----- drivers/staging/r8188eu/include/rtw_recv.h | 1 - drivers/staging/r8188eu/os_dep/recv_linux.c | 1 - 3 files changed, 1 insertion(+), 7 deletions(-)
drivers/staging/r8188eu/hal/usb_ops_linux.c +1 -5
@@ -437,11 +437,7 @@ u32 rtw_read_port(struct adapter *adapter, u8 *rmem) tmpaddr = (size_t )precvbuf->pskb->data; alignment = tmpaddr & (RECVBUFF_ALIGN_SZ -1 );skb_reserve (precvbuf->pskb, (RECVBUFF_ALIGN_SZ - alignment)); - - precvbuf->pbuf = precvbuf->pskb->data; }else {/* reuse skb */ - precvbuf->pbuf = precvbuf->pskb->data; - precvbuf->reuse = false; }
@@ -453,7 +449,7 @@ u32 rtw_read_port(struct adapter *adapter, u8 *rmem) pipe =usb_rcvbulkpipe (pusbd, pdvobj->RtInPipe);usb_fill_bulk_urb (purb, pusbd, pipe, - precvbuf->pbuf, + precvbuf->pskb->data,MAX_RECVBUF_SZ , usb_read_port_complete, precvbuf);/* context is precvbuf */
drivers/staging/r8188eu/include/rtw_recv.h +0 -1
@@ -208,7 +208,6 @@ struct sta_recv_priv {struct recv_buf {struct adapter *adapter; -u8 *pbuf;u8 *pallocated_buf;struct urb *purb;dma_addr_t dma_transfer_addr;/* (in) dma addr for transfer_buffer */
drivers/staging/r8188eu/os_dep/recv_linux.c +0 -1
@@ -25,7 +25,6 @@ int rtw_os_recvbuf_resource_alloc(struct adapter *padapter, precvbuf->pskb =NULL ; precvbuf->reuse = false; precvbuf->pallocated_buf =NULL ; - precvbuf->pbuf =NULL ;return res; }
Signature · 1 line
2.35.1
PATCH 9/9 staging: r8188eu: remove unused fields in struct recv_buf
In reply to Abdun NihaalThe fields alloc_sz, irp_pending and pallocated_buf in struct recv_buf are set but not used. And the field dma_transfer_addr is not used. Remove them.
--- drivers/staging/r8188eu/hal/rtl8188eu_recv.c | 1 - drivers/staging/r8188eu/include/rtw_recv.h | 4 ---- drivers/staging/r8188eu/os_dep/recv_linux.c | 2 -- 3 files changed, 7 deletions(-)
drivers/staging/r8188eu/hal/rtl8188eu_recv.c +0 -1
@@ -38,7 +38,6 @@ int rtl8188eu_init_recv_priv(struct adapter *padapter) precvbuf = (struct recv_buf *)precvpriv->precv_buf;for (i =0 ; i <NR_RECVBUFF ; i++) { - precvbuf->alloc_sz =MAX_RECVBUF_SZ ; res =rtw_os_recvbuf_resource_alloc (padapter, precvbuf);if (res == _FAIL)break ;
drivers/staging/r8188eu/include/rtw_recv.h +0 -4
@@ -208,11 +208,7 @@ struct sta_recv_priv {struct recv_buf {struct adapter *adapter; -u8 *pallocated_buf;struct urb *purb; -dma_addr_t dma_transfer_addr;/* (in) dma addr for transfer_buffer */ -u32 alloc_sz; -u8 irp_pending;struct sk_buff *pskb;u8 reuse; };
drivers/staging/r8188eu/os_dep/recv_linux.c +0 -2
@@ -18,13 +18,11 @@ int rtw_os_recvbuf_resource_alloc(struct adapter *padapter, {int res = _SUCCESS; - precvbuf->irp_pending = false; precvbuf->purb =usb_alloc_urb (0 ,GFP_KERNEL );if (!precvbuf->purb) res = _FAIL; precvbuf->pskb =NULL ; precvbuf->reuse = false; - precvbuf->pallocated_buf =NULL ;return res; }
Signature · 1 line
2.35.1