From d601ad5686de0fd1c2cae3a72063aa008bf50b3a Mon Sep 17 00:00:00 2001 From: Phillip Potter Date: Sat, 8 Jan 2022 00:55:50 +0000 Subject: [PATCH] staging: r8188eu: convert/remove DBG_88E calls in os_dep/usb_ops_linux.c Convert DBG_88E macro calls in os_dep/usb_ops_linux.c to use netdev_dbg when they may display useful information, and remove erroneous DBG_88E calls entirely. Signed-off-by: Phillip Potter Link: https://lore.kernel.org/r/20220108005550.26264-6-phil@philpotter.co.uk Signed-off-by: Greg Kroah-Hartman --- drivers/staging/r8188eu/os_dep/usb_ops_linux.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/drivers/staging/r8188eu/os_dep/usb_ops_linux.c b/drivers/staging/r8188eu/os_dep/usb_ops_linux.c index d1cb33d..3977a71 100644 --- a/drivers/staging/r8188eu/os_dep/usb_ops_linux.c +++ b/drivers/staging/r8188eu/os_dep/usb_ops_linux.c @@ -32,8 +32,6 @@ void rtw_read_port_cancel(struct adapter *padapter) int i; struct recv_buf *precvbuf = (struct recv_buf *)padapter->recvpriv.precv_buf; - DBG_88E("%s\n", __func__); - padapter->bReadPortCancel = true; for (i = 0; i < NR_RECVBUFF; i++) { @@ -72,30 +70,32 @@ static void usb_write_port_complete(struct urb *purb, struct pt_regs *regs) if (padapter->bSurpriseRemoved || padapter->bDriverStopped || padapter->bWritePortCancel) { - DBG_88E("%s(): TX Warning! bDriverStopped(%d) OR bSurpriseRemoved(%d) bWritePortCancel(%d) pxmitbuf->ext_tag(%x)\n", - __func__, padapter->bDriverStopped, - padapter->bSurpriseRemoved, padapter->bReadPortCancel, - pxmitbuf->ext_tag); + netdev_dbg(padapter->pnetdev, + "TX Warning! bDriverStopped(%d) OR bSurpriseRemoved(%d)\n", + padapter->bDriverStopped, padapter->bSurpriseRemoved); + netdev_dbg(padapter->pnetdev, + "TX Warning! bWritePortCancel(%d) pxmitbuf->ext_tag(%x)\n", + padapter->bReadPortCancel, pxmitbuf->ext_tag); goto check_completion; } if (purb->status) { - DBG_88E("###=> urb_write_port_complete status(%d)\n", purb->status); + netdev_dbg(padapter->pnetdev, "status(%d)\n", purb->status); if (purb->status == -EINPROGRESS) { goto check_completion; } else if (purb->status == -ENOENT) { - DBG_88E("%s: -ENOENT\n", __func__); + netdev_dbg(padapter->pnetdev, "-ENOENT\n"); goto check_completion; } else if (purb->status == -ECONNRESET) { - DBG_88E("%s: -ECONNRESET\n", __func__); + netdev_dbg(padapter->pnetdev, "-ECONNRESET\n"); goto check_completion; } else if (purb->status == -ESHUTDOWN) { padapter->bDriverStopped = true; goto check_completion; } else if ((purb->status != -EPIPE) && (purb->status != -EPROTO)) { padapter->bSurpriseRemoved = true; - DBG_88E("bSurpriseRemoved = true\n"); + netdev_dbg(padapter->pnetdev, "bSurpriseRemoved = true\n"); goto check_completion; } @@ -174,7 +174,7 @@ u32 rtw_write_port(struct adapter *padapter, u32 addr, u32 cnt, u8 *wmem) status = usb_submit_urb(purb, GFP_ATOMIC); if (status) { rtw_sctx_done_err(&pxmitbuf->sctx, RTW_SCTX_DONE_WRITE_PORT_ERR); - DBG_88E("usb_write_port, status =%d\n", status); + netdev_dbg(padapter->pnetdev, "usb_write_port, status = %d\n", status); switch (status) { case -ENODEV: @@ -202,8 +202,6 @@ void rtw_write_port_cancel(struct adapter *padapter) int i, j; struct xmit_buf *pxmitbuf = (struct xmit_buf *)padapter->xmitpriv.pxmitbuf; - DBG_88E("%s\n", __func__); - padapter->bWritePortCancel = true; for (i = 0; i < NR_XMITBUFF; i++) { -- 2.7.4