Skip to content

Commit

Permalink
staging: r8188eu: use standard error codes in rtl8188eu_inirp_init
Browse files Browse the repository at this point in the history
Replace the driver-specific _SUCCESS and _FAIL error codes in
rtl8188eu_inirp_init. Return 0 for success or a negative error
code as we do elsewhere in the kernel.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Tested-by: Philipp Hortmann <philipp.g.hortmann@gmail.com> # Edimax N150
Link: https://lore.kernel.org/r/20230206201800.139195-4-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
martin-kaiser authored and gregkh committed Feb 7, 2023
1 parent 972b28a commit a0b3a1c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 11 deletions.
16 changes: 6 additions & 10 deletions drivers/staging/r8188eu/hal/usb_halinit.c
Original file line number Diff line number Diff line change
Expand Up @@ -848,29 +848,25 @@ u32 rtl8188eu_hal_deinit(struct adapter *Adapter)
return _SUCCESS;
}

unsigned int rtl8188eu_inirp_init(struct adapter *Adapter)
int rtl8188eu_inirp_init(struct adapter *Adapter)
{
u8 i;
struct recv_buf *precvbuf;
uint status;
struct recv_priv *precvpriv = &Adapter->recvpriv;

status = _SUCCESS;
int ret;

/* issue Rx irp to receive data */
precvbuf = (struct recv_buf *)precvpriv->precv_buf;
for (i = 0; i < NR_RECVBUFF; i++) {
if (!rtw_read_port(Adapter, precvbuf)) {
status = _FAIL;
goto exit;
}
ret = rtw_read_port(Adapter, precvbuf);
if (ret)
return ret;

precvbuf++;
precvpriv->free_recv_buf_queue_cnt--;
}

exit:
return status;
return 0;
}

/* */
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/r8188eu/include/hal_intf.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ void UpdateHalRAMask8188EUsb(struct adapter *adapt, u32 mac_id, u8 rssi_level);
int rtl8188e_IOL_exec_cmds_sync(struct adapter *adapter,
struct xmit_frame *xmit_frame, u32 max_wating_ms, u32 bndy_cnt);

unsigned int rtl8188eu_inirp_init(struct adapter *Adapter);
int rtl8188eu_inirp_init(struct adapter *Adapter);

uint rtw_hal_init(struct adapter *padapter);
uint rtw_hal_deinit(struct adapter *padapter);
Expand Down

0 comments on commit a0b3a1c

Please sign in to comment.