* [PATCH 1/9] staging: r8188eu: remove unused field list
2022-03-03 15:51 [PATCH 0/9] staging: r8188eu: clean up struct recv_buf Abdun Nihaal
@ 2022-03-03 15:51 ` Abdun Nihaal
2022-03-03 15:51 ` [PATCH 2/9] staging: r8188eu: remove unused field recvbuf_lock Abdun Nihaal
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Abdun Nihaal @ 2022-03-03 15:51 UTC (permalink / raw)
To: gregkh
Cc: Larry.Finger, phil, straube.linux, paskripkin, martin,
abdun.nihaal, linux-staging, linux-kernel
The field list in struct recv_buf is initialized but not used.
Remove it.
Signed-off-by: Abdun Nihaal <abdun.nihaal@gmail.com>
---
drivers/staging/r8188eu/hal/rtl8188eu_recv.c | 1 -
drivers/staging/r8188eu/include/rtw_recv.h | 1 -
2 files changed, 2 deletions(-)
diff --git a/drivers/staging/r8188eu/hal/rtl8188eu_recv.c b/drivers/staging/r8188eu/hal/rtl8188eu_recv.c
index 6af72b3e7a7d..341605c67216 100644
--- a/drivers/staging/r8188eu/hal/rtl8188eu_recv.c
+++ b/drivers/staging/r8188eu/hal/rtl8188eu_recv.c
@@ -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);
diff --git a/drivers/staging/r8188eu/include/rtw_recv.h b/drivers/staging/r8188eu/include/rtw_recv.h
index d2f1c71f2262..90482cdd2236 100644
--- a/drivers/staging/r8188eu/include/rtw_recv.h
+++ b/drivers/staging/r8188eu/include/rtw_recv.h
@@ -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;
--
2.35.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 2/9] staging: r8188eu: remove unused field recvbuf_lock
2022-03-03 15:51 [PATCH 0/9] staging: r8188eu: clean up struct recv_buf Abdun Nihaal
2022-03-03 15:51 ` [PATCH 1/9] staging: r8188eu: remove unused field list Abdun Nihaal
@ 2022-03-03 15:51 ` Abdun Nihaal
2022-03-03 15:51 ` [PATCH 3/9] staging: r8188eu: remove unused fields in struct recv_buf Abdun Nihaal
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Abdun Nihaal @ 2022-03-03 15:51 UTC (permalink / raw)
To: gregkh
Cc: Larry.Finger, phil, straube.linux, paskripkin, martin,
abdun.nihaal, linux-staging, linux-kernel
The spinlock field recvbuf_lock in struct recv_buf is initialized but
not used. Remove it.
Signed-off-by: Abdun Nihaal <abdun.nihaal@gmail.com>
---
drivers/staging/r8188eu/hal/rtl8188eu_recv.c | 1 -
drivers/staging/r8188eu/include/rtw_recv.h | 1 -
2 files changed, 2 deletions(-)
diff --git a/drivers/staging/r8188eu/hal/rtl8188eu_recv.c b/drivers/staging/r8188eu/hal/rtl8188eu_recv.c
index 341605c67216..19d22db56e7d 100644
--- a/drivers/staging/r8188eu/hal/rtl8188eu_recv.c
+++ b/drivers/staging/r8188eu/hal/rtl8188eu_recv.c
@@ -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)
diff --git a/drivers/staging/r8188eu/include/rtw_recv.h b/drivers/staging/r8188eu/include/rtw_recv.h
index 90482cdd2236..7347ec162632 100644
--- a/drivers/staging/r8188eu/include/rtw_recv.h
+++ b/drivers/staging/r8188eu/include/rtw_recv.h
@@ -207,7 +207,6 @@ struct sta_recv_priv {
};
struct recv_buf {
- spinlock_t recvbuf_lock;
u32 ref_cnt;
struct adapter *adapter;
u8 *pbuf;
--
2.35.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 3/9] staging: r8188eu: remove unused fields in struct recv_buf
2022-03-03 15:51 [PATCH 0/9] staging: r8188eu: clean up struct recv_buf Abdun Nihaal
2022-03-03 15:51 ` [PATCH 1/9] staging: r8188eu: remove unused field list Abdun Nihaal
2022-03-03 15:51 ` [PATCH 2/9] staging: r8188eu: remove unused field recvbuf_lock Abdun Nihaal
@ 2022-03-03 15:51 ` Abdun Nihaal
2022-03-03 15:51 ` [PATCH 4/9] staging: r8188eu: remove unused field phead Abdun Nihaal
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Abdun Nihaal @ 2022-03-03 15:51 UTC (permalink / raw)
To: gregkh
Cc: Larry.Finger, phil, straube.linux, paskripkin, martin,
abdun.nihaal, linux-staging, linux-kernel
The fields len, ref_cnt and transfer_len in struct recv_buf are set
but not used. Remove them.
Signed-off-by: Abdun Nihaal <abdun.nihaal@gmail.com>
---
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(-)
diff --git a/drivers/staging/r8188eu/hal/rtl8188eu_recv.c b/drivers/staging/r8188eu/hal/rtl8188eu_recv.c
index 19d22db56e7d..76bf57c52a7e 100644
--- a/drivers/staging/r8188eu/hal/rtl8188eu_recv.c
+++ b/drivers/staging/r8188eu/hal/rtl8188eu_recv.c
@@ -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++;
}
diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/r8188eu/hal/usb_ops_linux.c
index 6bd2164ce1fa..4953a431ffd7 100644
--- a/drivers/staging/r8188eu/hal/usb_ops_linux.c
+++ b/drivers/staging/r8188eu/hal/usb_ops_linux.c
@@ -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);
diff --git a/drivers/staging/r8188eu/include/rtw_recv.h b/drivers/staging/r8188eu/include/rtw_recv.h
index 7347ec162632..bafc10905bed 100644
--- a/drivers/staging/r8188eu/include/rtw_recv.h
+++ b/drivers/staging/r8188eu/include/rtw_recv.h
@@ -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;
};
diff --git a/drivers/staging/r8188eu/os_dep/recv_linux.c b/drivers/staging/r8188eu/os_dep/recv_linux.c
index b205c50e9d75..d3b5fd83f926 100644
--- a/drivers/staging/r8188eu/os_dep/recv_linux.c
+++ b/drivers/staging/r8188eu/os_dep/recv_linux.c
@@ -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;
}
--
2.35.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 4/9] staging: r8188eu: remove unused field phead
2022-03-03 15:51 [PATCH 0/9] staging: r8188eu: clean up struct recv_buf Abdun Nihaal
` (2 preceding siblings ...)
2022-03-03 15:51 ` [PATCH 3/9] staging: r8188eu: remove unused fields in struct recv_buf Abdun Nihaal
@ 2022-03-03 15:51 ` Abdun Nihaal
2022-03-03 15:51 ` [PATCH 5/9] staging: r8188eu: remove unused field ptail Abdun Nihaal
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Abdun Nihaal @ 2022-03-03 15:51 UTC (permalink / raw)
To: gregkh
Cc: Larry.Finger, phil, straube.linux, paskripkin, martin,
abdun.nihaal, linux-staging, linux-kernel
The field phead in struct recv_buf is set but not used.
Remove it.
Signed-off-by: Abdun Nihaal <abdun.nihaal@gmail.com>
---
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(-)
diff --git a/drivers/staging/r8188eu/hal/rtl8188eu_recv.c b/drivers/staging/r8188eu/hal/rtl8188eu_recv.c
index 76bf57c52a7e..7db5cfaa251f 100644
--- a/drivers/staging/r8188eu/hal/rtl8188eu_recv.c
+++ b/drivers/staging/r8188eu/hal/rtl8188eu_recv.c
@@ -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;
}
diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/r8188eu/hal/usb_ops_linux.c
index 4953a431ffd7..8f4c059e09c9 100644
--- a/drivers/staging/r8188eu/hal/usb_ops_linux.c
+++ b/drivers/staging/r8188eu/hal/usb_ops_linux.c
@@ -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);
diff --git a/drivers/staging/r8188eu/include/rtw_recv.h b/drivers/staging/r8188eu/include/rtw_recv.h
index bafc10905bed..e4f844507d17 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 *phead;
u8 *pdata;
u8 *ptail;
u8 *pend;
diff --git a/drivers/staging/r8188eu/os_dep/recv_linux.c b/drivers/staging/r8188eu/os_dep/recv_linux.c
index d3b5fd83f926..8832199b10ee 100644
--- a/drivers/staging/r8188eu/os_dep/recv_linux.c
+++ b/drivers/staging/r8188eu/os_dep/recv_linux.c
@@ -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;
--
2.35.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 5/9] staging: r8188eu: remove unused field ptail
2022-03-03 15:51 [PATCH 0/9] staging: r8188eu: clean up struct recv_buf Abdun Nihaal
` (3 preceding siblings ...)
2022-03-03 15:51 ` [PATCH 4/9] staging: r8188eu: remove unused field phead Abdun Nihaal
@ 2022-03-03 15:51 ` Abdun Nihaal
2022-03-03 15:51 ` [PATCH 6/9] staging: r8188eu: remove unused field pend Abdun Nihaal
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Abdun Nihaal @ 2022-03-03 15:51 UTC (permalink / raw)
To: gregkh
Cc: Larry.Finger, phil, straube.linux, paskripkin, martin,
abdun.nihaal, linux-staging, linux-kernel
The field ptail in struct recv_buf is set but not used.
Remove it.
Signed-off-by: Abdun Nihaal <abdun.nihaal@gmail.com>
---
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(-)
diff --git a/drivers/staging/r8188eu/hal/rtl8188eu_recv.c b/drivers/staging/r8188eu/hal/rtl8188eu_recv.c
index 7db5cfaa251f..7a787944064f 100644
--- a/drivers/staging/r8188eu/hal/rtl8188eu_recv.c
+++ b/drivers/staging/r8188eu/hal/rtl8188eu_recv.c
@@ -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;
}
}
diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/r8188eu/hal/usb_ops_linux.c
index 8f4c059e09c9..74a221db1c3d 100644
--- a/drivers/staging/r8188eu/hal/usb_ops_linux.c
+++ b/drivers/staging/r8188eu/hal/usb_ops_linux.c
@@ -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;
diff --git a/drivers/staging/r8188eu/include/rtw_recv.h b/drivers/staging/r8188eu/include/rtw_recv.h
index e4f844507d17..c97ec9d0feed 100644
--- a/drivers/staging/r8188eu/include/rtw_recv.h
+++ b/drivers/staging/r8188eu/include/rtw_recv.h
@@ -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 */
diff --git a/drivers/staging/r8188eu/os_dep/recv_linux.c b/drivers/staging/r8188eu/os_dep/recv_linux.c
index 8832199b10ee..fd29f06b375a 100644
--- a/drivers/staging/r8188eu/os_dep/recv_linux.c
+++ b/drivers/staging/r8188eu/os_dep/recv_linux.c
@@ -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;
}
--
2.35.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 6/9] staging: r8188eu: remove unused field pend
2022-03-03 15:51 [PATCH 0/9] staging: r8188eu: clean up struct recv_buf Abdun Nihaal
` (4 preceding siblings ...)
2022-03-03 15:51 ` [PATCH 5/9] staging: r8188eu: remove unused field ptail Abdun Nihaal
@ 2022-03-03 15:51 ` Abdun Nihaal
2022-03-03 15:51 ` [PATCH 7/9] staging: r8188eu: remove unused field pdata Abdun Nihaal
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Abdun Nihaal @ 2022-03-03 15:51 UTC (permalink / raw)
To: gregkh
Cc: Larry.Finger, phil, straube.linux, paskripkin, martin,
abdun.nihaal, linux-staging, linux-kernel
The field pend in struct recv_buf is set but not used.
Remove it.
Signed-off-by: Abdun Nihaal <abdun.nihaal@gmail.com>
---
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(-)
diff --git a/drivers/staging/r8188eu/hal/rtl8188eu_recv.c b/drivers/staging/r8188eu/hal/rtl8188eu_recv.c
index 7a787944064f..9f772fc7d6c1 100644
--- a/drivers/staging/r8188eu/hal/rtl8188eu_recv.c
+++ b/drivers/staging/r8188eu/hal/rtl8188eu_recv.c
@@ -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;
}
}
diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/r8188eu/hal/usb_ops_linux.c
index 74a221db1c3d..f16a6bb21ab4 100644
--- a/drivers/staging/r8188eu/hal/usb_ops_linux.c
+++ b/drivers/staging/r8188eu/hal/usb_ops_linux.c
@@ -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;
diff --git a/drivers/staging/r8188eu/include/rtw_recv.h b/drivers/staging/r8188eu/include/rtw_recv.h
index c97ec9d0feed..f7bc1c9579fc 100644
--- a/drivers/staging/r8188eu/include/rtw_recv.h
+++ b/drivers/staging/r8188eu/include/rtw_recv.h
@@ -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;
diff --git a/drivers/staging/r8188eu/os_dep/recv_linux.c b/drivers/staging/r8188eu/os_dep/recv_linux.c
index fd29f06b375a..c8a0ac80df69 100644
--- a/drivers/staging/r8188eu/os_dep/recv_linux.c
+++ b/drivers/staging/r8188eu/os_dep/recv_linux.c
@@ -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;
}
--
2.35.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 7/9] staging: r8188eu: remove unused field pdata
2022-03-03 15:51 [PATCH 0/9] staging: r8188eu: clean up struct recv_buf Abdun Nihaal
` (5 preceding siblings ...)
2022-03-03 15:51 ` [PATCH 6/9] staging: r8188eu: remove unused field pend Abdun Nihaal
@ 2022-03-03 15:51 ` Abdun Nihaal
2022-03-03 15:51 ` [PATCH 8/9] staging: r8188eu: remove unneeded field pbuf Abdun Nihaal
2022-03-03 15:51 ` [PATCH 9/9] staging: r8188eu: remove unused fields in struct recv_buf Abdun Nihaal
8 siblings, 0 replies; 10+ messages in thread
From: Abdun Nihaal @ 2022-03-03 15:51 UTC (permalink / raw)
To: gregkh
Cc: Larry.Finger, phil, straube.linux, paskripkin, martin,
abdun.nihaal, linux-staging, linux-kernel
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 <abdun.nihaal@gmail.com>
---
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 9f772fc7d6c1..2960e349638d 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 f16a6bb21ab4..063bec94fd7e 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 87dd4152082a..a2320af11216 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 f7bc1c9579fc..55b1bb7840c8 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 c8a0ac80df69..a35c78f9ae44 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.35.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 8/9] staging: r8188eu: remove unneeded field pbuf
2022-03-03 15:51 [PATCH 0/9] staging: r8188eu: clean up struct recv_buf Abdun Nihaal
` (6 preceding siblings ...)
2022-03-03 15:51 ` [PATCH 7/9] staging: r8188eu: remove unused field pdata Abdun Nihaal
@ 2022-03-03 15:51 ` Abdun Nihaal
2022-03-03 15:51 ` [PATCH 9/9] staging: r8188eu: remove unused fields in struct recv_buf Abdun Nihaal
8 siblings, 0 replies; 10+ messages in thread
From: Abdun Nihaal @ 2022-03-03 15:51 UTC (permalink / raw)
To: gregkh
Cc: Larry.Finger, phil, straube.linux, paskripkin, martin,
abdun.nihaal, linux-staging, linux-kernel
The field pbuf in struct recv_buf can be removed as it can be replaced
with pskb->data. Remove pbuf field.
Signed-off-by: Abdun Nihaal <abdun.nihaal@gmail.com>
---
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(-)
diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/r8188eu/hal/usb_ops_linux.c
index 063bec94fd7e..673c30ed3cce 100644
--- a/drivers/staging/r8188eu/hal/usb_ops_linux.c
+++ b/drivers/staging/r8188eu/hal/usb_ops_linux.c
@@ -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 */
diff --git a/drivers/staging/r8188eu/include/rtw_recv.h b/drivers/staging/r8188eu/include/rtw_recv.h
index 55b1bb7840c8..e62cda94bc90 100644
--- a/drivers/staging/r8188eu/include/rtw_recv.h
+++ b/drivers/staging/r8188eu/include/rtw_recv.h
@@ -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 */
diff --git a/drivers/staging/r8188eu/os_dep/recv_linux.c b/drivers/staging/r8188eu/os_dep/recv_linux.c
index a35c78f9ae44..898ae944bd7d 100644
--- a/drivers/staging/r8188eu/os_dep/recv_linux.c
+++ b/drivers/staging/r8188eu/os_dep/recv_linux.c
@@ -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;
}
--
2.35.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 9/9] staging: r8188eu: remove unused fields in struct recv_buf
2022-03-03 15:51 [PATCH 0/9] staging: r8188eu: clean up struct recv_buf Abdun Nihaal
` (7 preceding siblings ...)
2022-03-03 15:51 ` [PATCH 8/9] staging: r8188eu: remove unneeded field pbuf Abdun Nihaal
@ 2022-03-03 15:51 ` Abdun Nihaal
8 siblings, 0 replies; 10+ messages in thread
From: Abdun Nihaal @ 2022-03-03 15:51 UTC (permalink / raw)
To: gregkh
Cc: Larry.Finger, phil, straube.linux, paskripkin, martin,
abdun.nihaal, linux-staging, linux-kernel
The 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.
Signed-off-by: Abdun Nihaal <abdun.nihaal@gmail.com>
---
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(-)
diff --git a/drivers/staging/r8188eu/hal/rtl8188eu_recv.c b/drivers/staging/r8188eu/hal/rtl8188eu_recv.c
index 2960e349638d..322b4549a92d 100644
--- a/drivers/staging/r8188eu/hal/rtl8188eu_recv.c
+++ b/drivers/staging/r8188eu/hal/rtl8188eu_recv.c
@@ -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;
diff --git a/drivers/staging/r8188eu/include/rtw_recv.h b/drivers/staging/r8188eu/include/rtw_recv.h
index e62cda94bc90..4ac4e6b3e177 100644
--- a/drivers/staging/r8188eu/include/rtw_recv.h
+++ b/drivers/staging/r8188eu/include/rtw_recv.h
@@ -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;
};
diff --git a/drivers/staging/r8188eu/os_dep/recv_linux.c b/drivers/staging/r8188eu/os_dep/recv_linux.c
index 898ae944bd7d..1e14b6d49795 100644
--- a/drivers/staging/r8188eu/os_dep/recv_linux.c
+++ b/drivers/staging/r8188eu/os_dep/recv_linux.c
@@ -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;
}
--
2.35.1
^ permalink raw reply related [flat|nested] 10+ messages in thread