staging: rtl8723au: Remove FUNC_ADPT_{FMT,ARG}

[deliverable/linux.git] / drivers / staging / rtl8723au / core / rtw_sreset.c

diff --git a/drivers/staging/rtl8723au/core/rtw_sreset.c b/drivers/staging/rtl8723au/core/rtw_sreset.c
index 5bf7beb6d19cdeb90e80eb8edb8f3c272bb88a55..0e1ea31420064207e6a30d5001f59447d103ffaa 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_sreset.c
+++ b/drivers/staging/rtl8723au/core/rtw_sreset.c
@@ -157,17 +157,24 @@ static void sreset_restore_network_status(struct rtw_adapter *padapter)
        struct mlme_priv *mlmepriv = &padapter->mlmepriv;
 
        if (check_fwstate(mlmepriv, WIFI_STATION_STATE)) {
-               DBG_8723A(FUNC_ADPT_FMT" fwstate:0x%08x - WIFI_STATION_STATE\n", FUNC_ADPT_ARG(padapter), get_fwstate(mlmepriv));
+               DBG_8723A("%s(%s): fwstate:0x%08x - WIFI_STATION_STATE\n",
+                         __func__, padapter->pnetdev->name,
+                         get_fwstate(mlmepriv));
                sreset_restore_network_station(padapter);
 #ifdef CONFIG_8723AU_AP_MODE
        } else if (check_fwstate(mlmepriv, WIFI_AP_STATE)) {
-               DBG_8723A(FUNC_ADPT_FMT" fwstate:0x%08x - WIFI_AP_STATE\n", FUNC_ADPT_ARG(padapter), get_fwstate(mlmepriv));
+               DBG_8723A("%s(%s): fwstate:0x%08x - WIFI_AP_STATE\n",
+                         __func__, padapter->pnetdev->name,
+                         get_fwstate(mlmepriv));
                rtw_ap_restore_network(padapter);
 #endif
        } else if (check_fwstate(mlmepriv, WIFI_ADHOC_STATE)) {
-               DBG_8723A(FUNC_ADPT_FMT" fwstate:0x%08x - WIFI_ADHOC_STATE\n", FUNC_ADPT_ARG(padapter), get_fwstate(mlmepriv));
+               DBG_8723A("%s(%s): fwstate:0x%08x - WIFI_ADHOC_STATE\n",
+                         __func__, padapter->pnetdev->name,
+                         get_fwstate(mlmepriv));
        } else {
-               DBG_8723A(FUNC_ADPT_FMT" fwstate:0x%08x - ???\n", FUNC_ADPT_ARG(padapter), get_fwstate(mlmepriv));
+               DBG_8723A("%s(%s): fwstate:0x%08x - ???\n", __func__,
+                         padapter->pnetdev->name, get_fwstate(mlmepriv));
        }
 }
 
@@ -179,7 +186,7 @@ static void sreset_stop_adapter(struct rtw_adapter *padapter)
        if (padapter == NULL)
                return;
 
-       DBG_8723A(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter));
+       DBG_8723A("%s(%s)\n", __func__, padapter->pnetdev->name);
 
        if (!rtw_netif_queue_stopped(padapter->pnetdev))
                netif_tx_stop_all_queues(padapter->pnetdev);
@@ -204,7 +211,7 @@ static void sreset_start_adapter(struct rtw_adapter *padapter)
        if (padapter == NULL)
                return;
 
-       DBG_8723A(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter));
+       DBG_8723A("%s(%s)\n", __func__, padapter->pnetdev->name);
 
        if (check_fwstate(pmlmepriv, _FW_LINKED)) {
                sreset_restore_network_status(padapter);