]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
staging: r8188eu: convert rtw_xmit_resource_alloc() to common error logic
authorMichael Straube <straube.linux@gmail.com>
Fri, 11 Nov 2022 08:37:31 +0000 (09:37 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 17 Nov 2022 18:48:46 +0000 (19:48 +0100)
Convert the function rtw_xmit_resource_alloc() away from returning
_FAIL or _SUCCESS which uses inverted error logic. Use the common
error logic instead. Return 0 for success and negative values for
failure.

Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20221111083733.3144-3-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/r8188eu/core/rtw_xmit.c

index bd6c1a401c590714b6b6d1f73de49d8c083cb35e..c0fda6ce7c56ceb95a426818f78aca355f02a21c 100644 (file)
@@ -38,7 +38,7 @@ static int rtw_xmit_resource_alloc(struct adapter *padapter, struct xmit_buf *px
 {
        pxmitbuf->pallocated_buf = kzalloc(alloc_sz, GFP_KERNEL);
        if (!pxmitbuf->pallocated_buf)
-               return _FAIL;
+               return -ENOMEM;
 
        pxmitbuf->pbuf = (u8 *)ALIGN((size_t)(pxmitbuf->pallocated_buf), XMITBUF_ALIGN_SZ);
        pxmitbuf->dma_transfer_addr = 0;
@@ -46,10 +46,10 @@ static int rtw_xmit_resource_alloc(struct adapter *padapter, struct xmit_buf *px
        pxmitbuf->pxmit_urb = usb_alloc_urb(0, GFP_KERNEL);
        if (!pxmitbuf->pxmit_urb) {
                kfree(pxmitbuf->pallocated_buf);
-               return _FAIL;
+               return -ENOMEM;
        }
 
-       return _SUCCESS;
+       return 0;
 }
 
 static void rtw_xmit_resource_free(struct adapter *padapter, struct xmit_buf *pxmitbuf,
@@ -151,12 +151,12 @@ s32       _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
                pxmitbuf->ext_tag = false;
 
                /* Tx buf allocation may fail sometimes, so sleep and retry. */
-               res = rtw_xmit_resource_alloc(padapter, pxmitbuf, (MAX_XMITBUF_SZ + XMITBUF_ALIGN_SZ));
-               if (res == _FAIL) {
+               if (rtw_xmit_resource_alloc(padapter, pxmitbuf, (MAX_XMITBUF_SZ + XMITBUF_ALIGN_SZ))) {
                        msleep(10);
-                       res = rtw_xmit_resource_alloc(padapter, pxmitbuf, (MAX_XMITBUF_SZ + XMITBUF_ALIGN_SZ));
-                       if (res == _FAIL)
+                       if (rtw_xmit_resource_alloc(padapter, pxmitbuf, (MAX_XMITBUF_SZ + XMITBUF_ALIGN_SZ))) {
+                               res = _FAIL;
                                goto free_xmitbuf;
+                       }
                }
 
                pxmitbuf->flags = XMIT_VO_QUEUE;
@@ -188,8 +188,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, struct adapter *padapter)
                pxmitbuf->padapter = padapter;
                pxmitbuf->ext_tag = true;
 
-               res = rtw_xmit_resource_alloc(padapter, pxmitbuf, max_xmit_extbuf_size + XMITBUF_ALIGN_SZ);
-               if (res == _FAIL) {
+               if (rtw_xmit_resource_alloc(padapter, pxmitbuf, max_xmit_extbuf_size + XMITBUF_ALIGN_SZ)) {
                        res = _FAIL;
                        goto free_xmit_extbuf;
                }