staging: rtl8723bs: tidy up error handling
authorYihao Han <hanyihao@vivo.com>
Fri, 8 Apr 2022 14:44:40 +0000 (07:44 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 12 Apr 2022 13:46:50 +0000 (15:46 +0200)
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.

Suggested-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Yihao Han <hanyihao@vivo.com>
Link: https://lore.kernel.org/r/20220408144442.17611-1-hanyihao@vivo.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8723bs/hal/sdio_ops.c

index a545832..107f427 100644 (file)
@@ -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 */