staging: r8188eu: convert DBG_88E_LEVEL calls in core/rtw_mlme_ext.c

Convert all DBG_88E_LEVEL macro calls in core/rtw_mlme_ext.c to plain
netdev_dbg calls, as although the information is potentially useful, we
should be exposing it using standard kernel debugging functionality.

Also fix some indentation issues in the block of one such call, and
remove usage of FUNC_ADPT_FMT/FUNC_ADPT_ARG macros in another, as
netdev_dbg provides equivalent functionality.

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

diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
index be9a77daf26ebe56cbbd03e6922094636d821a59..69841bdf53973e5a3ff5002bdeb4cf26ee9a3412 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
@@ -655,9 +655,11 @@ unsigned int OnBeacon(struct adapter *padapter, struct recv_frame *precv_frame)
                        if (psta) {
                                ret = rtw_check_bcn_info(padapter, pframe, len);
                                if (!ret) {
-                                               DBG_88E_LEVEL(_drv_info_, "ap has changed, disconnect now\n ");
-                                               receive_disconnect(padapter, pmlmeinfo->network.MacAddress, 0);
-                                               return _SUCCESS;
+                                       netdev_dbg(padapter->pnetdev,
+                                                  "ap has changed, disconnect now\n");
+                                       receive_disconnect(padapter,
+                                                          pmlmeinfo->network.MacAddress, 0);
+                                       return _SUCCESS;
                                }
                                /* update WMM, ERP in the beacon */
                                /* todo: the timer is used instead of the number of the beacon received */
@@ -931,7 +933,7 @@ unsigned int OnAuthClient(struct adapter *padapter, struct recv_frame *precv_fra
        }
 
        if (go2asoc) {
-               DBG_88E_LEVEL(_drv_info_, "auth success, start assoc\n");
+               netdev_dbg(padapter->pnetdev, "auth success, start assoc\n");
                start_clnt_assoc(padapter);
                return _SUCCESS;
        }
@@ -1503,8 +1505,9 @@ unsigned int OnDeAuth(struct adapter *padapter, struct recv_frame *precv_frame)
                struct sta_info *psta;
                struct sta_priv *pstapriv = &padapter->stapriv;
 
-               DBG_88E_LEVEL(_drv_always_, "ap recv deauth reason code(%d) sta:%pM\n",
-                             reason, GetAddr2Ptr(pframe));
+               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) {
@@ -1540,8 +1543,9 @@ unsigned int OnDeAuth(struct adapter *padapter, struct recv_frame *precv_frame)
                        }
                }
 
-               DBG_88E_LEVEL(_drv_always_, "sta recv deauth reason code(%d) sta:%pM, ignore = %d\n",
-                             reason, GetAddr3Ptr(pframe), ignore_received_deauth);
+               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);
@@ -1576,8 +1580,9 @@ unsigned int OnDisassoc(struct adapter *padapter, struct recv_frame *precv_frame
                struct sta_info *psta;
                struct sta_priv *pstapriv = &padapter->stapriv;
 
-               DBG_88E_LEVEL(_drv_always_, "ap recv disassoc reason code(%d) sta:%pM\n",
-                             reason, GetAddr2Ptr(pframe));
+               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) {
@@ -1596,8 +1601,9 @@ unsigned int OnDisassoc(struct adapter *padapter, struct recv_frame *precv_frame
 
                return _SUCCESS;
        } else {
-               DBG_88E_LEVEL(_drv_always_, "ap recv disassoc reason code(%d) sta:%pM\n",
-                             reason, GetAddr3Ptr(pframe));
+               netdev_dbg(padapter->pnetdev,
+                          "ap recv disassoc reason code(%d) sta:%pM\n",
+                          reason, GetAddr3Ptr(pframe));
 
                receive_disconnect(padapter, GetAddr3Ptr(pframe), reason);
        }
@@ -6478,7 +6484,7 @@ 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);
 
-       DBG_88E_LEVEL(_drv_info_, "start auth\n");
+       netdev_dbg(padapter->pnetdev, "start auth\n");
        issue_auth(padapter, NULL, 0);
 
        set_link_timer(pmlmeext, REAUTH_TO);
@@ -7223,8 +7229,8 @@ void linked_status_chk(struct adapter *padapter)
                        if (rx_chk == _FAIL) {
                                pmlmeext->retry++;
                                if (pmlmeext->retry > rx_chk_limit) {
-                                       DBG_88E_LEVEL(_drv_always_, FUNC_ADPT_FMT" disconnect or roaming\n",
-                                                     FUNC_ADPT_ARG(padapter));
+                                       netdev_dbg(padapter->pnetdev,
+                                                  "disconnect or roaming\n");
                                        receive_disconnect(padapter, pmlmeinfo->network.MacAddress,
                                                           WLAN_REASON_EXPIRATION_CHK);
                                        return;
@@ -7749,8 +7755,9 @@ u8 setkey_hdl(struct adapter *padapter, u8 *pbuf)
        /* write cam */
        ctrl = BIT(15) | ((pparm->algorithm) << 2) | pparm->keyid;
 
-       DBG_88E_LEVEL(_drv_info_, "set group key to hw: alg:%d(WEP40-1 WEP104-5 TKIP-2 AES-4) "
-                       "keyid:%d\n", pparm->algorithm, 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;
@@ -7779,8 +7786,9 @@ u8 set_stakey_hdl(struct adapter *padapter, u8 *pbuf)
 
        cam_id = 4;
 
-       DBG_88E_LEVEL(_drv_info_, "set pairwise key to hw: alg:%d(WEP40-1 WEP104-5 TKIP-2 AES-4) camid:%d\n",
-                     pparm->algorithm, cam_id);
+       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;