staging: rtl8188eu: stop using DBG_88E

Stop using DBG_88E which is a custom macro for printing debugging
messages. Instead start using pr_debug and in the process define
pr_fmt.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/os_dep/usb_intf.c b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
index 2d75c77c8cdbc24a8d143cacd492bc6bd1235c22..b245e9cd780e3d15bd4cc5f70d77bd7bb8c216db 100644 (file)
--- a/drivers/staging/rtl8188eu/os_dep/usb_intf.c
+++ b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
@@ -19,6 +19,7 @@
  ******************************************************************************/
 #define _HCI_INTF_C_
 
+#define pr_fmt(fmt) "R8188EU: " fmt
 #include <osdep_service.h>
 #include <drv_types.h>
 #include <recv_osdep.h>
@@ -143,7 +144,7 @@ static void usb_dvobj_deinit(struct usb_interface *usb_intf)
                                 * on sitesurvey for the first time when
                                 * device is up . Reset usb port for sitesurvey
                                 * fail issue. */
-                               DBG_88E("usb attached..., try to reset usb device\n");
+                               pr_debug("usb attached..., try to reset usb device\n");
                                usb_reset_device(interface_to_usbdev(usb_intf));
                        }
                }
@@ -194,7 +195,7 @@ static void rtw_dev_unload(struct adapter *padapter)
        RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("+rtw_dev_unload\n"));
 
        if (padapter->bup) {
-               DBG_88E("===> rtw_dev_unload\n");
+               pr_debug("===> rtw_dev_unload\n");
                padapter->bDriverStopped = true;
                if (padapter->xmitpriv.ack_tx)
                        rtw_ack_tx_done(&padapter->xmitpriv, RTW_SCTX_DONE_DRV_STOP);
@@ -217,7 +218,7 @@ static void rtw_dev_unload(struct adapter *padapter)
                         ("r871x_dev_unload():padapter->bup == false\n"));
        }
 
-       DBG_88E("<=== rtw_dev_unload\n");
+       pr_debug("<=== rtw_dev_unload\n");
 
        RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("-rtw_dev_unload\n"));
 }
@@ -234,11 +235,11 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
        u32 start_time = jiffies;
 
 
-       DBG_88E("==> %s (%s:%d)\n", __func__, current->comm, current->pid);
+       pr_debug("==> %s (%s:%d)\n", __func__, current->comm, current->pid);
 
        if ((!padapter->bup) || (padapter->bDriverStopped) ||
            (padapter->bSurpriseRemoved)) {
-               DBG_88E("padapter->bup=%d bDriverStopped=%d bSurpriseRemoved = %d\n",
+               pr_debug("padapter->bup=%d bDriverStopped=%d bSurpriseRemoved = %d\n",
                        padapter->bup, padapter->bDriverStopped,
                        padapter->bSurpriseRemoved);
                goto exit;
@@ -260,7 +261,7 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
 
        if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) &&
            check_fwstate(pmlmepriv, _FW_LINKED)) {
-               DBG_88E("%s:%d %s(%pM), length:%d assoc_ssid.length:%d\n",
+               pr_debug("%s:%d %s(%pM), length:%d assoc_ssid.length:%d\n",
                        __func__, __LINE__,
                        pmlmepriv->cur_network.network.Ssid.Ssid,
                        pmlmepriv->cur_network.network.MacAddress,
@@ -286,7 +287,7 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
                rtw_indicate_disconnect(padapter);
 
 exit:
-       DBG_88E("<===  %s return %d.............. in %dms\n", __func__
+       pr_debug("<===  %s return %d.............. in %dms\n", __func__
                , ret, rtw_get_passing_time_ms(start_time));
 
        return ret;
@@ -299,7 +300,7 @@ static int rtw_resume_process(struct adapter *padapter)
        int ret = -1;
        u32 start_time = jiffies;
 
-       DBG_88E("==> %s (%s:%d)\n", __func__, current->comm, current->pid);
+       pr_debug("==> %s (%s:%d)\n", __func__, current->comm, current->pid);
 
        if (padapter) {
                pnetdev = padapter->pnetdev;
@@ -312,7 +313,7 @@ static int rtw_resume_process(struct adapter *padapter)
        rtw_reset_drv_sw(padapter);
        pwrpriv->bkeepfwalive = false;
 
-       DBG_88E("bkeepfwalive(%x)\n", pwrpriv->bkeepfwalive);
+       pr_debug("bkeepfwalive(%x)\n", pwrpriv->bkeepfwalive);
        if (pm_netdev_open(pnetdev, true) != 0)
                goto exit;
 
@@ -327,7 +328,7 @@ static int rtw_resume_process(struct adapter *padapter)
 exit:
        if (pwrpriv)
                pwrpriv->bInSuspend = false;
-       DBG_88E("<===  %s return %d.............. in %dms\n", __func__,
+       pr_debug("<===  %s return %d.............. in %dms\n", __func__,
                ret, rtw_get_passing_time_ms(start_time));
 
 
@@ -400,8 +401,8 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
                dvobj->pusbdev->do_remote_wakeup = 1;
                pusb_intf->needs_remote_wakeup = 1;
                device_init_wakeup(&pusb_intf->dev, 1);
-               DBG_88E("\n  padapter->pwrctrlpriv.bSupportRemoteWakeup~~~~~~\n");
-               DBG_88E("\n  padapter->pwrctrlpriv.bSupportRemoteWakeup~~~[%d]~~~\n",
+               pr_debug("\n  padapter->pwrctrlpriv.bSupportRemoteWakeup~~~~~~\n");
+               pr_debug("\n  padapter->pwrctrlpriv.bSupportRemoteWakeup~~~[%d]~~~\n",
                        device_may_wakeup(&pusb_intf->dev));
        }
 #endif
@@ -409,13 +410,13 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
        /* 2012-07-11 Move here to prevent the 8723AS-VAU BT auto
         * suspend influence */
        if (usb_autopm_get_interface(pusb_intf) < 0)
-                       DBG_88E("can't get autopm:\n");
+                       pr_debug("can't get autopm:\n");
 
        /*  alloc dev name after read efuse. */
        rtw_init_netdev_name(pnetdev, padapter->registrypriv.ifname);
        rtw_macaddr_cfg(padapter->eeprompriv.mac_addr);
        memcpy(pnetdev->dev_addr, padapter->eeprompriv.mac_addr, ETH_ALEN);
-       DBG_88E("MAC Address from pnetdev->dev_addr =  %pM\n",
+       pr_debug("MAC Address from pnetdev->dev_addr =  %pM\n",
                pnetdev->dev_addr);
 
        /* step 6. Tell the network stack we exist */
@@ -424,7 +425,7 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
                goto free_hal_data;
        }
 
-       DBG_88E("bDriverStopped:%d, bSurpriseRemoved:%d, bup:%d, hw_init_completed:%d\n"
+       pr_debug("bDriverStopped:%d, bSurpriseRemoved:%d, bup:%d, hw_init_completed:%d\n"
                , padapter->bDriverStopped
                , padapter->bSurpriseRemoved
                , padapter->bup
@@ -468,7 +469,7 @@ static void rtw_usb_if1_deinit(struct adapter *if1)
        rtw_cancel_all_timer(if1);
 
        rtw_dev_unload(if1);
-       DBG_88E("+r871xu_dev_remove, hw_init_completed=%d\n",
+       pr_debug("+r871xu_dev_remove, hw_init_completed=%d\n",
                if1->hw_init_completed);
        rtw_free_drv_sw(if1);
        if (pnetdev)
@@ -493,7 +494,7 @@ static int rtw_drv_init(struct usb_interface *pusb_intf, const struct usb_device
 
        if1 = rtw_usb_if1_init(dvobj, pusb_intf, pdid);
        if (if1 == NULL) {
-               DBG_88E("rtw_init_primarystruct adapter Failed!\n");
+               pr_debug("rtw_init_primarystruct adapter Failed!\n");
                goto free_dvobj;
        }
 
@@ -518,7 +519,7 @@ static void rtw_dev_remove(struct usb_interface *pusb_intf)
        struct adapter *padapter = dvobj->if1;
 
 
-       DBG_88E("+rtw_dev_remove\n");
+       pr_debug("+rtw_dev_remove\n");
        RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("+dev_remove()\n"));
 
        if (!pusb_intf->unregistering)
@@ -534,7 +535,7 @@ static void rtw_dev_remove(struct usb_interface *pusb_intf)
        usb_dvobj_deinit(pusb_intf);
 
        RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("-dev_remove()\n"));
-       DBG_88E("-r871xu_dev_remove, done\n");
+       pr_debug("-r871xu_dev_remove, done\n");
 }
 
 static struct usb_driver rtl8188e_usb_drv = {