Commit 14b4302f authored by Nishka Dasgupta's avatar Nishka Dasgupta Committed by Greg Kroah-Hartman
Browse files

staging: rtl8712: r8712_os_recvbuf_resource_alloc(): Change return values 



Change return values of r8712_os_recvbuf_resource_alloc from
_SUCCESS/_FAIL to 0/-ENOMEM respectively.
Modify check at call site to check for non-zero return value instead of
_FAIL. Thereafter remove variable at call site that stored the return
value and perform the check directly.

Signed-off-by: default avatarNishka Dasgupta <nishkadg.linux@gmail.com>
Link: https://lore.kernel.org/r/20190802064212.30476-4-nishkadg.linux@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0bf36e60

drivers/staging/rtl8712/recv_linux.c

+2 −2
Original line number Diff line number Diff line
@@ -40,12 +40,12 @@ void r8712_os_recv_resource_alloc(struct _adapter *padapter, 
int r8712_os_recvbuf_resource_alloc(struct _adapter *padapter,

				    struct recv_buf *precvbuf)

{

	int res = _SUCCESS;

	int res = 0;



	precvbuf->irp_pending = false;

	precvbuf->purb = usb_alloc_urb(0, GFP_KERNEL);

	if (!precvbuf->purb)

		res = _FAIL;

		res = -ENOMEM;

	precvbuf->pskb = NULL;

	precvbuf->pallocated_buf = NULL;

	precvbuf->pbuf = NULL;

drivers/staging/rtl8712/rtl8712_recv.c

+2 −4
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ void r8712_init_recv_priv(struct recv_priv *precvpriv, struct _adapter *padapter 
{

	int i;

	struct recv_buf *precvbuf;

	int res = _SUCCESS;

	addr_t tmpaddr = 0;

	int alignment = 0;

	struct sk_buff *pskb = NULL;
@@ -49,15 +48,14 @@ void r8712_init_recv_priv(struct recv_priv *precvpriv, struct _adapter *padapter 
	precvpriv->pallocated_recv_buf =

		kzalloc(NR_RECVBUFF * sizeof(struct recv_buf) + 4, GFP_ATOMIC);

	if (!precvpriv->pallocated_recv_buf)

		return _FAIL;

		return;

	precvpriv->precv_buf = precvpriv->pallocated_recv_buf + 4 -

			      ((addr_t)(precvpriv->pallocated_recv_buf) & 3);

	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);

		res = r8712_os_recvbuf_resource_alloc(padapter, precvbuf);

		if (res == _FAIL)

		if (r8712_os_recvbuf_resource_alloc(padapter, precvbuf))

			break;

		precvbuf->ref_cnt = 0;

		precvbuf->adapter = padapter;

CRA Git | Maintained and supported by SUSTech CRA and CCSE