Commit 972b28a4 authored by Martin Kaiser's avatar Martin Kaiser Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: use standard error codes in rtw_read_port 



Replace the driver-specific _SUCCESS and _FAIL error codes in
rtw_read_port. Return 0 for success or a negative error code as
we do elsewhere in the kernel.

Signed-off-by: default avatarMartin Kaiser <martin@kaiser.cx>
Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
Link: https://lore.kernel.org/r/20230206201800.139195-3-martin@kaiser.cx


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

drivers/staging/r8188eu/hal/usb_ops_linux.c

+6 −7
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ static void usb_read_port_complete(struct urb *purb) 
	}

}



u32 rtw_read_port(struct adapter *adapter, struct recv_buf *precvbuf)

int rtw_read_port(struct adapter *adapter, struct recv_buf *precvbuf)

{

	struct urb *purb = NULL;

	struct dvobj_priv	*pdvobj = adapter_to_dvobj(adapter);
@@ -416,13 +416,12 @@ u32 rtw_read_port(struct adapter *adapter, struct recv_buf *precvbuf) 
	unsigned int pipe;

	size_t tmpaddr = 0;

	size_t alignment = 0;

	u32 ret = _SUCCESS;



	if (adapter->bDriverStopped || adapter->bSurpriseRemoved)

		return _FAIL;

		return -EPERM;



	if (!precvbuf)

		return _FAIL;

		return -ENOMEM;



	if (!precvbuf->reuse || !precvbuf->pskb) {

		precvbuf->pskb = skb_dequeue(&precvpriv->free_recv_skb_queue);
@@ -434,7 +433,7 @@ u32 rtw_read_port(struct adapter *adapter, struct recv_buf *precvbuf) 
	if (!precvbuf->reuse || !precvbuf->pskb) {

		precvbuf->pskb = netdev_alloc_skb(adapter->pnetdev, MAX_RECVBUF_SZ + RECVBUFF_ALIGN_SZ);

		if (!precvbuf->pskb)

			return _FAIL;

			return -ENOMEM;



		tmpaddr = (size_t)precvbuf->pskb->data;

		alignment = tmpaddr & (RECVBUFF_ALIGN_SZ - 1);
@@ -458,9 +457,9 @@ u32 rtw_read_port(struct adapter *adapter, struct recv_buf *precvbuf) 


	err = usb_submit_urb(purb, GFP_ATOMIC);

	if ((err) && (err != (-EPERM)))

		ret = _FAIL;

		return err;



	return ret;

	return 0;

}



void rtl8188eu_xmit_tasklet(unsigned long priv)

drivers/staging/r8188eu/include/rtw_io.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
int __must_check rtw_read8(struct adapter *adapter, u32 addr, u8 *data);

int __must_check rtw_read16(struct adapter *adapter, u32 addr, u16 *data);

int __must_check rtw_read32(struct adapter *adapter, u32 addr, u32 *data);

u32 rtw_read_port(struct adapter *adapter, struct recv_buf *precvbuf);

int rtw_read_port(struct adapter *adapter, struct recv_buf *precvbuf);

void rtw_read_port_cancel(struct adapter *adapter);



int rtw_write8(struct adapter *adapter, u32 addr, u8 val);