staging: r8188eu: remove previously converted DBG_88E_LEVEL calls

Remove all netdev_dbg and dev_dbg calls that were previously converted
from DBG_88E_LEVEL. After some thought, it makes more sense to just
entirely strip all of these calls, so that debugging code in the driver
can be more consistent and useful going forwards.

Signed-off-by: Phillip Potter <phil@philpotter.co.uk>
Link: https://lore.kernel.org/r/20220216010709.791-2-phil@philpotter.co.uk
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/core/rtw_fw.c b/drivers/staging/r8188eu/core/rtw_fw.c
index f591b09..ce0e4e3 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_fw.c
+++ b/drivers/staging/r8188eu/core/rtw_fw.c
@@ -243,7 +243,6 @@ static int load_firmware(struct rt_firmware *rtfw, struct device *device)
                goto exit;
        }
        rtfw->size = fw->size;
-       dev_dbg(device, "!bUsedWoWLANFw, FmrmwareLen:%d+\n", rtfw->size);
 
 exit:
        release_firmware(fw);

diff --git a/drivers/staging/r8188eu/core/rtw_ioctl_set.c b/drivers/staging/r8188eu/core/rtw_ioctl_set.c
index c95ca47..e7f3537 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_ioctl_set.c
+++ b/drivers/staging/r8188eu/core/rtw_ioctl_set.c
@@ -110,8 +110,6 @@ u8 rtw_set_802_11_bssid(struct adapter *padapter, u8 *bssid)
        u32 cur_time = 0;
        struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
 
-       netdev_dbg(padapter->pnetdev, "set bssid:%pM\n", bssid);
-
        if ((bssid[0] == 0x00 && bssid[1] == 0x00 && bssid[2] == 0x00 &&
             bssid[3] == 0x00 && bssid[4] == 0x00 && bssid[5] == 0x00) ||
            (bssid[0] == 0xFF && bssid[1] == 0xFF && bssid[2] == 0xFF &&
@@ -186,9 +184,6 @@ u8 rtw_set_802_11_ssid(struct adapter *padapter, struct ndis_802_11_ssid *ssid)
        struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
        struct wlan_network *pnetwork = &pmlmepriv->cur_network;
 
-       netdev_dbg(padapter->pnetdev, "set ssid [%s] fw_state=0x%08x\n",
-                  ssid->Ssid, get_fwstate(pmlmepriv));
-
        if (!padapter->hw_init_completed) {
                status = _FAIL;
                goto exit;

diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
index 5e1f3a1..329b27b 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
@@ -649,8 +649,6 @@ unsigned int OnBeacon(struct adapter *padapter, struct recv_frame *precv_frame)
                        if (psta) {
                                ret = rtw_check_bcn_info(padapter, pframe, len);
                                if (!ret) {
-                                       netdev_dbg(padapter->pnetdev,
-                                                  "ap has changed, disconnect now\n");
                                        receive_disconnect(padapter,
                                                           pmlmeinfo->network.MacAddress, 0);
                                        return _SUCCESS;
@@ -932,7 +930,6 @@ unsigned int OnAuthClient(struct adapter *padapter, struct recv_frame *precv_fra
        }
 
        if (go2asoc) {
-               netdev_dbg(padapter->pnetdev, "auth success, start assoc\n");
                start_clnt_assoc(padapter);
                return _SUCCESS;
        }
@@ -1507,10 +1504,6 @@ unsigned int OnDeAuth(struct adapter *padapter, struct recv_frame *precv_frame)
                struct sta_info *psta;
                struct sta_priv *pstapriv = &padapter->stapriv;
 
-               netdev_dbg(padapter->pnetdev,
-                          "ap recv deauth reason code(%d) sta:%pM\n",
-                          reason, GetAddr2Ptr(pframe));
-
                psta = rtw_get_stainfo(pstapriv, GetAddr2Ptr(pframe));
                if (psta) {
                        u8 updated = 0;
@@ -1545,10 +1538,6 @@ unsigned int OnDeAuth(struct adapter *padapter, struct recv_frame *precv_frame)
                        }
                }
 
-               netdev_dbg(padapter->pnetdev,
-                          "sta recv deauth reason code(%d) sta:%pM, ignore = %d\n",
-                          reason, GetAddr3Ptr(pframe), ignore_received_deauth);
-
                if (!ignore_received_deauth)
                        receive_disconnect(padapter, GetAddr3Ptr(pframe), reason);
        }
@@ -1582,10 +1571,6 @@ unsigned int OnDisassoc(struct adapter *padapter, struct recv_frame *precv_frame
                struct sta_info *psta;
                struct sta_priv *pstapriv = &padapter->stapriv;
 
-               netdev_dbg(padapter->pnetdev,
-                          "ap recv disassoc reason code(%d) sta:%pM\n",
-                          reason, GetAddr2Ptr(pframe));
-
                psta = rtw_get_stainfo(pstapriv, GetAddr2Ptr(pframe));
                if (psta) {
                        u8 updated = 0;
@@ -1603,10 +1588,6 @@ unsigned int OnDisassoc(struct adapter *padapter, struct recv_frame *precv_frame
 
                return _SUCCESS;
        } else {
-               netdev_dbg(padapter->pnetdev,
-                          "ap recv disassoc reason code(%d) sta:%pM\n",
-                          reason, GetAddr3Ptr(pframe));
-
                receive_disconnect(padapter, GetAddr3Ptr(pframe), reason);
        }
        pmlmepriv->LinkDetectInfo.bBusyTraffic = false;
@@ -6506,7 +6487,6 @@ void start_clnt_auth(struct adapter *padapter)
        /*      For the Win8 P2P connection, it will be hard to have a successful connection if this Wi-Fi doesn't connect to it. */
        issue_deauth(padapter, (&pmlmeinfo->network)->MacAddress, WLAN_REASON_DEAUTH_LEAVING);
 
-       netdev_dbg(padapter->pnetdev, "start auth\n");
        issue_auth(padapter, NULL, 0);
 
        set_link_timer(pmlmeext, REAUTH_TO);
@@ -7266,8 +7246,6 @@ void linked_status_chk(struct adapter *padapter)
                        if (rx_chk == _FAIL) {
                                pmlmeext->retry++;
                                if (pmlmeext->retry > rx_chk_limit) {
-                                       netdev_dbg(padapter->pnetdev,
-                                                  "disconnect or roaming\n");
                                        receive_disconnect(padapter, pmlmeinfo->network.MacAddress,
                                                           WLAN_REASON_EXPIRATION_CHK);
                                        return;
@@ -7793,9 +7771,6 @@ u8 setkey_hdl(struct adapter *padapter, u8 *pbuf)
        /* write cam */
        ctrl = BIT(15) | ((pparm->algorithm) << 2) | pparm->keyid;
 
-       netdev_dbg(padapter->pnetdev,
-                  "set group key to hw: alg:%d(WEP40-1 WEP104-5 TKIP-2 AES-4) keyid:%d\n",
-                  pparm->algorithm, pparm->keyid);
        write_cam(padapter, pparm->keyid, ctrl, null_sta, pparm->key);
 
        return H2C_SUCCESS;
@@ -7824,9 +7799,6 @@ u8 set_stakey_hdl(struct adapter *padapter, u8 *pbuf)
 
        cam_id = 4;
 
-       netdev_dbg(padapter->pnetdev,
-                  "set pairwise key to hw: alg:%d(WEP40-1 WEP104-5 TKIP-2 AES-4) camid:%d\n",
-                  pparm->algorithm, cam_id);
        if ((pmlmeinfo->state & 0x03) == WIFI_FW_AP_STATE) {
                struct sta_info *psta;
                struct sta_priv *pstapriv = &padapter->stapriv;

diff --git a/drivers/staging/r8188eu/core/rtw_pwrctrl.c b/drivers/staging/r8188eu/core/rtw_pwrctrl.c
index 46e44ae..ff35685 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_pwrctrl.c
+++ b/drivers/staging/r8188eu/core/rtw_pwrctrl.c
@@ -15,12 +15,6 @@ void ips_enter(struct adapter *padapter)
 
        if (pxmit_priv->free_xmitbuf_cnt != NR_XMITBUFF ||
            pxmit_priv->free_xmit_extbuf_cnt != NR_XMIT_EXTBUFF) {
-               netdev_dbg(padapter->pnetdev,
-                          "There are some pkts to transmit\n");
-               netdev_dbg(padapter->pnetdev,
-                          "free_xmitbuf_cnt: %d, free_xmit_extbuf_cnt: %d\n",
-                          pxmit_priv->free_xmitbuf_cnt,
-                          pxmit_priv->free_xmit_extbuf_cnt);
                return;
        }
 
@@ -35,7 +29,6 @@ void ips_enter(struct adapter *padapter)
        DBG_88E("==>ips_enter cnts:%d\n", pwrpriv->ips_enter_cnts);
        if (rf_off == pwrpriv->change_rfpwrstate) {
                pwrpriv->bpower_saving = true;
-               netdev_dbg(padapter->pnetdev, "nolinked power save enter\n");
 
                if (pwrpriv->ips_mode == IPS_LEVEL_2)
                        pwrpriv->bkeepfwalive = true;
@@ -68,7 +61,6 @@ int ips_leave(struct adapter *padapter)
                if (result == _SUCCESS) {
                        pwrpriv->rf_pwrstate = rf_on;
                }
-               netdev_dbg(padapter->pnetdev, "nolinked power save leave\n");
 
                if ((_WEP40_ == psecuritypriv->dot11PrivacyAlgrthm) || (_WEP104_ == psecuritypriv->dot11PrivacyAlgrthm)) {
                        DBG_88E("==>%s, channel(%d), processing(%x)\n", __func__, padapter->mlmeextpriv.cur_channel, pwrpriv->bips_processing);

diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r8188eu/core/rtw_xmit.c
index f3e788e..30714fe 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_xmit.c
+++ b/drivers/staging/r8188eu/core/rtw_xmit.c
@@ -460,7 +460,6 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p
                        }
                }
        } else if (0x888e == pattrib->ether_type) {
-               netdev_dbg(padapter->pnetdev, "send eapol packet\n");
        }
 
        if ((pattrib->ether_type == 0x888e) || (pattrib->dhcp_pkt == 1))

diff --git a/drivers/staging/r8188eu/os_dep/ioctl_linux.c b/drivers/staging/r8188eu/os_dep/ioctl_linux.c
index f6a683c..3bb2714 100644 (file)
--- a/drivers/staging/r8188eu/os_dep/ioctl_linux.c
+++ b/drivers/staging/r8188eu/os_dep/ioctl_linux.c
@@ -58,7 +58,6 @@ void rtw_indicate_wx_assoc_event(struct adapter *padapter)
 
        memcpy(wrqu.ap_addr.sa_data, pmlmepriv->cur_network.network.MacAddress, ETH_ALEN);
 
-       netdev_dbg(padapter->pnetdev, "assoc success\n");
        wireless_send_event(padapter->pnetdev, SIOCGIWAP, &wrqu, NULL);
 }
 
@@ -71,7 +70,6 @@ void rtw_indicate_wx_disassoc_event(struct adapter *padapter)
        wrqu.ap_addr.sa_family = ARPHRD_ETHER;
        memset(wrqu.ap_addr.sa_data, 0, ETH_ALEN);
 
-       netdev_dbg(padapter->pnetdev, "indicate disassoc\n");
        wireless_send_event(padapter->pnetdev, SIOCGIWAP, &wrqu, NULL);
 }