Commit a790d58e authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman

staging: rtl8723au: Get rid of FUNC_NDEV_{FMT,ARG}

Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9cd613c7
......@@ -1778,8 +1778,8 @@ int rtw_ap_inform_ch_switch23a (struct rtw_adapter *padapter, u8 new_ch, u8 ch_o
if ((pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE)
return ret;
DBG_8723A(FUNC_NDEV_FMT" with ch:%u, offset:%u\n",
FUNC_NDEV_ARG(padapter->pnetdev), new_ch, ch_offset);
DBG_8723A("%s(%s): with ch:%u, offset:%u\n", __func__,
padapter->pnetdev->name, new_ch, ch_offset);
spin_lock_bh(&pstapriv->asoc_list_lock);
phead = &pstapriv->asoc_list;
......@@ -1810,7 +1810,7 @@ int rtw_sta_flush23a(struct rtw_adapter *padapter)
struct sta_info *chk_alive_list[NUM_STA];
int i;
DBG_8723A(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(padapter->pnetdev));
DBG_8723A("%s(%s)\n", __func__, padapter->pnetdev->name);
if ((pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE)
return ret;
......
......@@ -893,8 +893,8 @@ u8 rtw_set_ch_cmd23a(struct rtw_adapter*padapter, u8 ch, u8 bw, u8 ch_offset,
u8 res = _SUCCESS;
DBG_8723A(FUNC_NDEV_FMT" ch:%u, bw:%u, ch_offset:%u\n",
FUNC_NDEV_ARG(padapter->pnetdev), ch, bw, ch_offset);
DBG_8723A("%s(%s): ch:%u, bw:%u, ch_offset:%u\n", __func__,
padapter->pnetdev->name, ch, bw, ch_offset);
/* check input parameter */
......@@ -932,8 +932,7 @@ u8 rtw_set_ch_cmd23a(struct rtw_adapter*padapter, u8 ch, u8 bw, u8 ch_offset,
/* do something based on res... */
exit:
DBG_8723A(FUNC_NDEV_FMT" res:%u\n", FUNC_NDEV_ARG(padapter->pnetdev),
res);
DBG_8723A("%s(%s): res:%u\n", __func__, padapter->pnetdev->name, res);
return res;
}
......
......@@ -987,15 +987,15 @@ void rtw_scan_abort23a(struct rtw_adapter *adapter)
if (adapter->bDriverStopped || adapter->bSurpriseRemoved)
break;
DBG_8723A(FUNC_NDEV_FMT "fw_state = _FW_UNDER_SURVEY!\n",
FUNC_NDEV_ARG(adapter->pnetdev));
DBG_8723A("%s(%s): fw_state = _FW_UNDER_SURVEY!\n",
__func__, adapter->pnetdev->name);
msleep(20);
}
if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)) {
if (!adapter->bDriverStopped && !adapter->bSurpriseRemoved)
DBG_8723A(FUNC_NDEV_FMT "waiting for scan_abort time "
"out!\n", FUNC_NDEV_ARG(adapter->pnetdev));
DBG_8723A("%s(%s): waiting for scan_abort time out!\n",
__func__, adapter->pnetdev->name);
rtw_cfg80211_indicate_scan_done(wdev_to_priv(adapter->rtw_wdev),
true);
}
......
......@@ -3918,9 +3918,8 @@ void issue_action_spct_ch_switch23a(struct rtw_adapter *padapter,
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
u8 category, action;
DBG_8723A(FUNC_NDEV_FMT" ra ="MAC_FMT", ch:%u, offset:%u\n",
FUNC_NDEV_ARG(padapter->pnetdev), MAC_ARG(ra),
new_ch, ch_offset);
DBG_8723A("%s(%s): ra ="MAC_FMT", ch:%u, offset:%u\n", __func__,
padapter->pnetdev->name, MAC_ARG(ra), new_ch, ch_offset);
if ((pmgntframe = alloc_mgtxmitframe23a(pxmitpriv)) == NULL)
return;
......@@ -6527,9 +6526,9 @@ u8 set_ch_hdl23a(struct rtw_adapter *padapter, const u8 *pbuf)
set_ch_parm = (struct set_ch_parm *)pbuf;
DBG_8723A(FUNC_NDEV_FMT" ch:%u, bw:%u, ch_offset:%u\n",
FUNC_NDEV_ARG(padapter->pnetdev),
set_ch_parm->ch, set_ch_parm->bw, set_ch_parm->ch_offset);
DBG_8723A("%s(%s): ch:%u, bw:%u, ch_offset:%u\n", __func__,
padapter->pnetdev->name, set_ch_parm->ch,
set_ch_parm->bw, set_ch_parm->ch_offset);
pmlmeext->cur_channel = set_ch_parm->ch;
pmlmeext->cur_ch_offset = set_ch_parm->ch_offset;
......
......@@ -139,8 +139,6 @@ void _rtw_init_queue23a(struct rtw_queue *pqueue);
#define ADPT_FMT "%s"
#define ADPT_ARG(adapter) adapter->pnetdev->name
#define FUNC_NDEV_FMT "%s(%s)"
#define FUNC_NDEV_ARG(ndev) __func__, ndev->name
/* Macros for handling unaligned memory accesses */
......
......@@ -605,7 +605,7 @@ static int _rtw_drv_register_netdev(struct rtw_adapter *padapter, char *name)
/* Tell the network stack we exist */
if (register_netdev(pnetdev)) {
DBG_8723A(FUNC_NDEV_FMT "Failed!\n", FUNC_NDEV_ARG(pnetdev));
DBG_8723A("%s(%s): Failed!\n", __func__, pnetdev->name);
ret = _FAIL;
goto error_register_netdev;
}
......@@ -876,7 +876,7 @@ static int netdev_close(struct net_device *pnetdev)
void rtw_ndev_destructor(struct net_device *ndev)
{
DBG_8723A(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
DBG_8723A("%s(%s)\n", __func__, ndev->name);
kfree(ndev->ieee80211_ptr);
free_netdev(ndev);
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment