From 9cd613c739ee436862e681acad8ded18ff85fd9a Mon Sep 17 00:00:00 2001 From: Jes Sorensen Date: Fri, 9 May 2014 15:04:03 +0200 Subject: [PATCH] staging: rtl8723au: Remove FUNC_ADPT_{FMT,ARG} Signed-off-by: Jes Sorensen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723au/core/rtw_cmd.c | 9 --- .../staging/rtl8723au/core/rtw_ioctl_set.c | 4 +- drivers/staging/rtl8723au/core/rtw_mlme.c | 2 +- drivers/staging/rtl8723au/core/rtw_mlme_ext.c | 70 ++++++++++--------- drivers/staging/rtl8723au/core/rtw_sreset.c | 19 +++-- .../staging/rtl8723au/include/osdep_service.h | 2 - .../staging/rtl8723au/os_dep/ioctl_cfg80211.c | 69 +++++++----------- 7 files changed, 79 insertions(+), 96 deletions(-) diff --git a/drivers/staging/rtl8723au/core/rtw_cmd.c b/drivers/staging/rtl8723au/core/rtw_cmd.c index a1f8ad98b742..cd8af988cb4a 100644 --- a/drivers/staging/rtl8723au/core/rtw_cmd.c +++ b/drivers/staging/rtl8723au/core/rtw_cmd.c @@ -380,11 +380,6 @@ u8 rtw_sitesurvey_cmd23a(struct rtw_adapter *padapter, memcpy(&psurveyPara->ssid[i], &ssid[i], sizeof(struct cfg80211_ssid)); psurveyPara->ssid_num++; - if (0) - DBG_8723A(FUNC_ADPT_FMT" ssid:(%s, %d)\n", - FUNC_ADPT_ARG(padapter), - psurveyPara->ssid[i].ssid, - psurveyPara->ssid[i].ssid_len); } } } @@ -398,10 +393,6 @@ u8 rtw_sitesurvey_cmd23a(struct rtw_adapter *padapter, memcpy(&psurveyPara->ch[i], &ch[i], sizeof(struct rtw_ieee80211_channel)); psurveyPara->ch_num++; - if (0) - DBG_8723A(FUNC_ADPT_FMT" ch:%u\n", - FUNC_ADPT_ARG(padapter), - psurveyPara->ch[i].hw_value); } } } diff --git a/drivers/staging/rtl8723au/core/rtw_ioctl_set.c b/drivers/staging/rtl8723au/core/rtw_ioctl_set.c index 0024ff6f13e0..abf30c5ce10a 100644 --- a/drivers/staging/rtl8723au/core/rtw_ioctl_set.c +++ b/drivers/staging/rtl8723au/core/rtw_ioctl_set.c @@ -406,8 +406,8 @@ u8 rtw_set_802_11_bssid23a_list_scan(struct rtw_adapter *padapter, } } else { if (rtw_is_scan_deny(padapter)) { - DBG_8723A(FUNC_ADPT_FMT": scan deny\n", - FUNC_ADPT_ARG(padapter)); + DBG_8723A("%s(%s): scan deny\n", + __func__, padapter->pnetdev->name); return _SUCCESS; } diff --git a/drivers/staging/rtl8723au/core/rtw_mlme.c b/drivers/staging/rtl8723au/core/rtw_mlme.c index 13bfc2fbc2fc..e4656adfb051 100644 --- a/drivers/staging/rtl8723au/core/rtw_mlme.c +++ b/drivers/staging/rtl8723au/core/rtw_mlme.c @@ -1600,7 +1600,7 @@ void rtw_scan_timeout_handler23a(unsigned long data) struct rtw_adapter *adapter = (struct rtw_adapter *)data; struct mlme_priv *pmlmepriv = &adapter->mlmepriv; - DBG_8723A(FUNC_ADPT_FMT" fw_state =%x\n", FUNC_ADPT_ARG(adapter), + DBG_8723A("%s(%s): fw_state =%x\n", __func__, adapter->pnetdev->name, get_fwstate(pmlmepriv)); spin_lock_bh(&pmlmepriv->lock); diff --git a/drivers/staging/rtl8723au/core/rtw_mlme_ext.c b/drivers/staging/rtl8723au/core/rtw_mlme_ext.c index 7af99baa98ba..839ced140da7 100644 --- a/drivers/staging/rtl8723au/core/rtw_mlme_ext.c +++ b/drivers/staging/rtl8723au/core/rtw_mlme_ext.c @@ -2086,17 +2086,17 @@ static s32 rtw_action_public_decache(struct recv_frame *recv_frame, s32 token) if (token >= 0) { if ((seq_ctrl == mlmeext->action_public_rxseq) && (token == mlmeext->action_public_dialog_token)) { - DBG_8723A(FUNC_ADPT_FMT" seq_ctrl = 0x%x, " - "rxseq = 0x%x, token:%d\n", - FUNC_ADPT_ARG(adapter), seq_ctrl, + DBG_8723A("%s(%s): seq_ctrl = 0x%x, " + "rxseq = 0x%x, token:%d\n", __func__, + adapter->pnetdev->name, seq_ctrl, mlmeext->action_public_rxseq, token); return _FAIL; } } else { if (seq_ctrl == mlmeext->action_public_rxseq) { - DBG_8723A(FUNC_ADPT_FMT" seq_ctrl = 0x%x, " - "rxseq = 0x%x\n", - FUNC_ADPT_ARG(adapter), seq_ctrl, + DBG_8723A("%s(%s): seq_ctrl = 0x%x, " + "rxseq = 0x%x\n", __func__, + adapter->pnetdev->name, seq_ctrl, mlmeext->action_public_rxseq); return _FAIL; } @@ -2257,15 +2257,15 @@ struct xmit_frame *alloc_mgtxmitframe23a(struct xmit_priv *pxmitpriv) pmgntframe = rtw_alloc_xmitframe23a_ext(pxmitpriv); if (!pmgntframe) { - DBG_8723A(FUNC_ADPT_FMT" alloc xmitframe fail\n", - FUNC_ADPT_ARG(pxmitpriv->adapter)); + DBG_8723A("%s(%s): alloc xmitframe fail\n", __func__, + pxmitpriv->adapter->pnetdev->name); goto exit; } pxmitbuf = rtw_alloc_xmitbuf23a_ext(pxmitpriv); if (!pxmitbuf) { - DBG_8723A(FUNC_ADPT_FMT" alloc xmitbuf fail\n", - FUNC_ADPT_ARG(pxmitpriv->adapter)); + DBG_8723A("%s(%s): alloc xmitbuf fail\n", __func__, + pxmitpriv->adapter->pnetdev->name); rtw_free_xmitframe23a(pxmitpriv, pmgntframe); pmgntframe = NULL; goto exit; @@ -2719,9 +2719,9 @@ void issue_probersp23a(struct rtw_adapter *padapter, unsigned char *da, remainder_ie = ssid_ie + 2; remainder_ielen = pframe - remainder_ie; - DBG_8723A_LEVEL(_drv_warning_, FUNC_ADPT_FMT - " remainder_ielen > MAX_IE_SZ\n", - FUNC_ADPT_ARG(padapter)); + DBG_8723A_LEVEL(_drv_warning_, "%s(%s): " + "remainder_ielen > MAX_IE_SZ\n", + __func__, padapter->pnetdev->name); if (remainder_ielen > MAX_IE_SZ) remainder_ielen = MAX_IE_SZ; @@ -2947,14 +2947,15 @@ int issue_probereq23a_ex23a(struct rtw_adapter *padapter, if (try_cnt && wait_ms) { if (da) - DBG_8723A(FUNC_ADPT_FMT" to "MAC_FMT", ch:%u%s, %d/%d " - "in %u ms\n", FUNC_ADPT_ARG(padapter), + DBG_8723A("%s(%s): to "MAC_FMT", ch:%u%s, %d/%d " + "in %u ms\n", __func__, + padapter->pnetdev->name, MAC_ARG(da), rtw_get_oper_ch23a(padapter), ret == _SUCCESS?", acked":"", i, try_cnt, jiffies_to_msecs(jiffies - start)); else - DBG_8723A(FUNC_ADPT_FMT", ch:%u%s, %d/%d in %u ms\n", - FUNC_ADPT_ARG(padapter), + DBG_8723A("%s(%s):, ch:%u%s, %d/%d in %u ms\n", + __func__, padapter->pnetdev->name, rtw_get_oper_ch23a(padapter), ret == _SUCCESS?", acked":"", i, try_cnt, jiffies_to_msecs(jiffies - start)); @@ -3646,14 +3647,15 @@ int issue_nulldata23a(struct rtw_adapter *padapter, unsigned char *da, if (try_cnt && wait_ms) { if (da) - DBG_8723A(FUNC_ADPT_FMT" to "MAC_FMT", ch:%u%s, %d/%d " - "in %u ms\n", FUNC_ADPT_ARG(padapter), + DBG_8723A("%s(%s): to "MAC_FMT", ch:%u%s, %d/%d " + "in %u ms\n", __func__, + padapter->pnetdev->name, MAC_ARG(da), rtw_get_oper_ch23a(padapter), ret == _SUCCESS?", acked":"", i, try_cnt, jiffies_to_msecs(jiffies - start)); else - DBG_8723A(FUNC_ADPT_FMT", ch:%u%s, %d/%d in %u ms\n", - FUNC_ADPT_ARG(padapter), + DBG_8723A("%s(%s):, ch:%u%s, %d/%d in %u ms\n", + __func__, padapter->pnetdev->name, rtw_get_oper_ch23a(padapter), ret == _SUCCESS?", acked":"", i, try_cnt, jiffies_to_msecs(jiffies - start)); @@ -3775,14 +3777,15 @@ int issue_qos_nulldata23a(struct rtw_adapter *padapter, unsigned char *da, if (try_cnt && wait_ms) { if (da) - DBG_8723A(FUNC_ADPT_FMT" to "MAC_FMT", ch:%u%s, %d/%d " - "in %u ms\n", FUNC_ADPT_ARG(padapter), + DBG_8723A("%s(%s): to "MAC_FMT", ch:%u%s, %d/%d " + "in %u ms\n", __func__, + padapter->pnetdev->name, MAC_ARG(da), rtw_get_oper_ch23a(padapter), ret == _SUCCESS?", acked":"", i, try_cnt, jiffies_to_msecs(jiffies - start)); else - DBG_8723A(FUNC_ADPT_FMT", ch:%u%s, %d/%d in %u ms\n", - FUNC_ADPT_ARG(padapter), + DBG_8723A("%s(%s):, ch:%u%s, %d/%d in %u ms\n", + __func__, padapter->pnetdev->name, rtw_get_oper_ch23a(padapter), ret == _SUCCESS?", acked":"", i, try_cnt, jiffies_to_msecs(jiffies - start)); @@ -3886,14 +3889,15 @@ int issue_deauth23a_ex23a(struct rtw_adapter *padapter, u8 *da, if (try_cnt && wait_ms) { if (da) - DBG_8723A(FUNC_ADPT_FMT" to "MAC_FMT", ch:%u%s, %d/%d " - "in %u ms\n", FUNC_ADPT_ARG(padapter), + DBG_8723A("%s(%s): to "MAC_FMT", ch:%u%s, %d/%d " + "in %u ms\n", __func__, + padapter->pnetdev->name, MAC_ARG(da), rtw_get_oper_ch23a(padapter), ret == _SUCCESS?", acked":"", i, try_cnt, jiffies_to_msecs(jiffies - start)); else - DBG_8723A(FUNC_ADPT_FMT", ch:%u%s, %d/%d in %u ms\n", - FUNC_ADPT_ARG(padapter), + DBG_8723A("%s(%s):, ch:%u%s, %d/%d in %u ms\n", + __func__, padapter->pnetdev->name, rtw_get_oper_ch23a(padapter), ret == _SUCCESS?", acked":"", i, try_cnt, jiffies_to_msecs(jiffies - start)); @@ -5618,8 +5622,10 @@ void linked_status_chk23a(struct rtw_adapter *padapter) if (rx_chk == _FAIL) { pmlmeext->retry++; if (pmlmeext->retry > rx_chk_limit) { - DBG_8723A_LEVEL(_drv_always_, FUNC_ADPT_FMT" disconnect or roaming\n", - FUNC_ADPT_ARG(padapter)); + DBG_8723A_LEVEL(_drv_always_, + "%s(%s): disconnect or " + "roaming\n", __func__, + padapter->pnetdev->name); receive_disconnect23a(padapter, pmlmeinfo->network.MacAddress, WLAN_REASON_EXPIRATION_CHK); return; @@ -6083,8 +6089,6 @@ rtw_scan_ch_decision(struct rtw_adapter *padapter, /* acquire channels from in */ j = 0; for (i = 0;ichannel_set, in[i].hw_value)) >= 0 ) diff --git a/drivers/staging/rtl8723au/core/rtw_sreset.c b/drivers/staging/rtl8723au/core/rtw_sreset.c index 5bf7beb6d19c..0e1ea3142006 100644 --- 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); diff --git a/drivers/staging/rtl8723au/include/osdep_service.h b/drivers/staging/rtl8723au/include/osdep_service.h index 67887bcdaec3..d7322ea6dc56 100644 --- a/drivers/staging/rtl8723au/include/osdep_service.h +++ b/drivers/staging/rtl8723au/include/osdep_service.h @@ -141,8 +141,6 @@ void _rtw_init_queue23a(struct rtw_queue *pqueue); #define ADPT_ARG(adapter) adapter->pnetdev->name #define FUNC_NDEV_FMT "%s(%s)" #define FUNC_NDEV_ARG(ndev) __func__, ndev->name -#define FUNC_ADPT_FMT "%s(%s)" -#define FUNC_ADPT_ARG(adapter) __func__, adapter->pnetdev->name /* Macros for handling unaligned memory accesses */ diff --git a/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c index efdb48dfbb4d..e0bd62bd554e 100644 --- a/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c +++ b/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c @@ -646,8 +646,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, if (!psta && check_fwstate(pmlmepriv, WIFI_AP_STATE)) { /* group key */ if (param->u.crypt.set_tx == 0) { /* group key */ if (strcmp(param->u.crypt.alg, "WEP") == 0) { - DBG_8723A("%s, set group_key, WEP\n", - __func__); + DBG_8723A("%s, set group_key, WEP\n", __func__); memcpy(psecuritypriv-> dot118021XGrpKey[param->u.crypt.idx]. @@ -1451,7 +1450,7 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy, struct cfg80211_ssid *ssids = request->ssids; bool need_indicate_scan_done = false; - DBG_8723A(FUNC_ADPT_FMT "\n", FUNC_ADPT_ARG(padapter)); + DBG_8723A("%s(%s):\n", __func__, padapter->pnetdev->name); spin_lock_bh(&pwdev_priv->scan_req_lock); pwdev_priv->scan_request = request; @@ -1480,8 +1479,8 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy, goto check_need_indicate_scan_done; } if (rtw_is_scan_deny(padapter)) { - DBG_8723A(FUNC_ADPT_FMT ": scan deny\n", - FUNC_ADPT_ARG(padapter)); + DBG_8723A("%s(%s): scan deny\n", __func__, + padapter->pnetdev->name); need_indicate_scan_done = true; goto check_need_indicate_scan_done; } @@ -1509,8 +1508,8 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy, if (request->n_channels == 1) { for (i = 0; i < request->n_channels && i < RTW_CHANNEL_SCAN_AMOUNT; i++) { - DBG_8723A(FUNC_ADPT_FMT CHAN_FMT "\n", - FUNC_ADPT_ARG(padapter), + DBG_8723A("%s:(%s):" CHAN_FMT "\n", + __func__, padapter->pnetdev->name, CHAN_ARG(request->channels[i])); ch[i].hw_value = request->channels[i]->hw_value; ch[i].flags = request->channels[i]->flags; @@ -2551,23 +2550,23 @@ static int rtw_cfg80211_add_monitor_if(struct rtw_adapter *padapter, char *name, struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(padapter->rtw_wdev); if (!name) { - DBG_8723A(FUNC_ADPT_FMT " without specific name\n", - FUNC_ADPT_ARG(padapter)); + DBG_8723A("%s(%s): without specific name\n", + __func__, padapter->pnetdev->name); ret = -EINVAL; goto out; } if (pwdev_priv->pmon_ndev) { - DBG_8723A(FUNC_ADPT_FMT " monitor interface exist: %s\n", - FUNC_ADPT_ARG(padapter), pwdev_priv->pmon_ndev->name); + DBG_8723A("%s(%s): monitor interface exist: %s\n", __func__, + padapter->pnetdev->name, pwdev_priv->pmon_ndev->name); ret = -EBUSY; goto out; } mon_ndev = alloc_etherdev(sizeof(struct rtw_adapter)); if (!mon_ndev) { - DBG_8723A(FUNC_ADPT_FMT " allocate ndev fail\n", - FUNC_ADPT_ARG(padapter)); + DBG_8723A("%s(%s): allocate ndev fail\n", __func__, + padapter->pnetdev->name); ret = -ENOMEM; goto out; } @@ -2582,8 +2581,8 @@ static int rtw_cfg80211_add_monitor_if(struct rtw_adapter *padapter, char *name, /* wdev */ mon_wdev = kzalloc(sizeof(struct wireless_dev), GFP_KERNEL); if (!mon_wdev) { - DBG_8723A(FUNC_ADPT_FMT " allocate mon_wdev fail\n", - FUNC_ADPT_ARG(padapter)); + DBG_8723A("%s(%s): allocate mon_wdev fail\n", __func__, + padapter->pnetdev->name); ret = -ENOMEM; goto out; } @@ -2624,8 +2623,8 @@ cfg80211_rtw_add_virtual_intf(struct wiphy *wiphy, const char *name, struct net_device *ndev = NULL; struct rtw_adapter *padapter = wiphy_to_adapter(wiphy); - DBG_8723A(FUNC_ADPT_FMT " wiphy:%s, name:%s, type:%d\n", - FUNC_ADPT_ARG(padapter), wiphy_name(wiphy), name, type); + DBG_8723A("%s(%s): wiphy:%s, name:%s, type:%d\n", __func__, + padapter->pnetdev->name, wiphy_name(wiphy), name, type); switch (type) { case NL80211_IFTYPE_ADHOC: @@ -2654,7 +2653,8 @@ cfg80211_rtw_add_virtual_intf(struct wiphy *wiphy, const char *name, break; } - DBG_8723A(FUNC_ADPT_FMT " ndev:%p, ret:%d\n", FUNC_ADPT_ARG(padapter), + DBG_8723A("%s(%s): ndev:%p, ret:%d\n", __func__, + padapter->pnetdev->name, ndev, ret); return ndev ? ndev->ieee80211_ptr : ERR_PTR(ret); @@ -2757,29 +2757,12 @@ static int cfg80211_rtw_start_ap(struct wiphy *wiphy, struct net_device *ndev, struct wlan_bssid_ex *pbss_network_ext = &adapter->mlmeextpriv.mlmext_info.network; - if (0) - DBG_8723A(FUNC_ADPT_FMT - " ssid:(%s,%d), from ie:(%s,%d)\n", - FUNC_ADPT_ARG(adapter), settings->ssid, - (int)settings->ssid_len, - pbss_network->Ssid.ssid, - pbss_network->Ssid.ssid_len); - memcpy(pbss_network->Ssid.ssid, (void *)settings->ssid, settings->ssid_len); pbss_network->Ssid.ssid_len = settings->ssid_len; memcpy(pbss_network_ext->Ssid.ssid, (void *)settings->ssid, settings->ssid_len); pbss_network_ext->Ssid.ssid_len = settings->ssid_len; - - if (0) - DBG_8723A(FUNC_ADPT_FMT - " after ssid:(%s,%d), (%s,%d)\n", - FUNC_ADPT_ARG(adapter), - pbss_network->Ssid.ssid, - pbss_network->Ssid.ssid_len, - pbss_network_ext->Ssid.ssid, - pbss_network_ext->Ssid.ssid_len); } return ret; @@ -3102,16 +3085,16 @@ static int cfg80211_rtw_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, /* cookie generation */ *cookie = (unsigned long)buf; - DBG_8723A(FUNC_ADPT_FMT " len =%zu, ch =%d" - "\n", FUNC_ADPT_ARG(padapter), len, tx_ch); + DBG_8723A("%s(%s): len =%zu, ch =%d\n", __func__, + padapter->pnetdev->name, len, tx_ch); /* indicate ack before issue frame to avoid racing with rsp frame */ rtw_cfg80211_mgmt_tx_status(padapter, *cookie, buf, len, ack, GFP_KERNEL); if (rtw_action_frame_parse23a(buf, len, &category, &action) == false) { - DBG_8723A(FUNC_ADPT_FMT " frame_control:0x%x\n", - FUNC_ADPT_ARG(padapter), + DBG_8723A("%s(%s): frame_control:0x%x\n", __func__, + padapter->pnetdev->name, le16_to_cpu(hdr->frame_control)); goto exit; } @@ -3130,8 +3113,8 @@ static int cfg80211_rtw_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, } while (dump_cnt < dump_limit && tx_ret != _SUCCESS); if (tx_ret != _SUCCESS || dump_cnt > 1) { - DBG_8723A(FUNC_ADPT_FMT " %s (%d/%d) in %d ms\n", - FUNC_ADPT_ARG(padapter), + DBG_8723A("%s(%s): %s (%d/%d) in %d ms\n", + __func__, padapter->pnetdev->name, tx_ret == _SUCCESS ? "OK" : "FAIL", dump_cnt, dump_limit, jiffies_to_msecs(jiffies - start)); } @@ -3143,9 +3126,9 @@ static int cfg80211_rtw_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, case P2P_INVIT_RESP: if (pwdev_priv->invit_info.flags & BIT(0) && pwdev_priv->invit_info.status == 0) { - DBG_8723A(FUNC_ADPT_FMT " agree with invitation of " + DBG_8723A("%s(%s): agree with invitation of " "persistent group\n", - FUNC_ADPT_ARG(padapter)); + __func__, padapter->pnetdev->name); rtw_set_scan_deny(padapter, 5000); rtw_pwr_wakeup_ex(padapter, 5000); rtw_clear_scan_deny(padapter); -- 2.34.1