drivers/staging/rtl8723bs/hal/sdio_ops.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
remove a unnecesarry if in `sd_recv_rxfifo`
Suggested-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Yihao Han <hanyihao@vivo.com>
---
drivers/staging/rtl8723bs/hal/sdio_ops.c | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/rtl8723bs/hal/sdio_ops.c b/drivers/staging/rtl8723bs/hal/sdio_ops.c
index a545832a468e..107f427ee4aa 100755
--- a/drivers/staging/rtl8723bs/hal/sdio_ops.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_ops.c
@@ -811,17 +811,14 @@ static struct recv_buf *sd_recv_rxfifo(struct adapter *adapter, u32 size)
SIZE_PTR alignment = 0;
recvbuf->pskb = rtw_skb_alloc(MAX_RECVBUF_SZ + RECVBUFF_ALIGN_SZ);
-
- if (recvbuf->pskb) {
- recvbuf->pskb->dev = adapter->pnetdev;
-
- tmpaddr = (SIZE_PTR)recvbuf->pskb->data;
- alignment = tmpaddr & (RECVBUFF_ALIGN_SZ - 1);
- skb_reserve(recvbuf->pskb, (RECVBUFF_ALIGN_SZ - alignment));
- }
-
if (!recvbuf->pskb)
return NULL;
+
+ recvbuf->pskb->dev = adapter->pnetdev;
+
+ tmpaddr = (SIZE_PTR)recvbuf->pskb->data;
+ alignment = tmpaddr & (RECVBUFF_ALIGN_SZ - 1);
+ skb_reserve(recvbuf->pskb, (RECVBUFF_ALIGN_SZ - alignment));
}
/* 3 3. read data from rxfifo */
--
2.17.1
On Fri, Apr 08, 2022 at 06:59:11AM -0700, Yihao Han wrote:
> remove a unnecesarry if in `sd_recv_rxfifo`
>
> Suggested-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Yihao Han <hanyihao@vivo.com>
> ---
^^^
Under this cut off line then you need to say what changed since version
1. Something like: "v2: more extensive cleanup. v3: edit commit message".
I do want you to edit the commit message because I don't think it really
describes the patch very well. How I would write this commit message is
this:
[PATCH v3] staging: rtl8723bs: tidy up error handling
The check for if rtw_skb_alloc() fails is done twice and is written
in a confusing way. Move the "if (!recvbuf->pskb)" right after
the allocation. The "if (recvbuf->pskb)" check can now be deleted
and the code pulled in one tab.
To me this explains the problem and the solution.
regards,
dan carpenter
© 2016 - 2026 Red Hat, Inc.