Skip to content

L
linux
Commit cd0f93ee authored by Harsha Sharma's avatar Harsha Sharma Committed by Greg Kroah-Hartman
Browse files
Options

staging: rtl8723bs: Add space between concatenated strings 

Use spaces between concatenated strings
Signed-off-by: default avatarHarsha Sharma <harshasharmaiitr@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ce5a98af
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 25 deletions
drivers/staging/rtl8723bs/os_dep/os_intfs.c
View file @ cd0f93ee
...@@ -467,7 +467,7 @@ static int rtw_ndev_notifier_call(struct notifier_block * nb, unsigned long stat ...@@ -467,7 +467,7 @@ static int rtw_ndev_notifier_call(struct notifier_block * nb, unsigned long stat
if (dev->netdev_ops->ndo_do_ioctl != rtw_ioctl) if (dev->netdev_ops->ndo_do_ioctl != rtw_ioctl)
return NOTIFY_DONE; return NOTIFY_DONE;
DBG_871X_LEVEL(_drv_info_, FUNC_NDEV_FMT" state:%lu\n", FUNC_NDEV_ARG(dev), state); DBG_871X_LEVEL(_drv_info_, FUNC_NDEV_FMT " state:%lu\n", FUNC_NDEV_ARG(dev), state);
switch (state) { switch (state) {
case NETDEV_CHANGENAME: case NETDEV_CHANGENAME:
...@@ -497,7 +497,7 @@ static int rtw_ndev_init(struct net_device *dev) ...@@ -497,7 +497,7 @@ static int rtw_ndev_init(struct net_device *dev)
{ {
struct adapter *adapter = rtw_netdev_priv(dev); struct adapter *adapter = rtw_netdev_priv(dev);
DBG_871X_LEVEL(_drv_always_, FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(adapter)); DBG_871X_LEVEL(_drv_always_, FUNC_ADPT_FMT "\n", FUNC_ADPT_ARG(adapter));
strncpy(adapter->old_ifname, dev->name, IFNAMSIZ); strncpy(adapter->old_ifname, dev->name, IFNAMSIZ);
rtw_adapter_proc_init(dev); rtw_adapter_proc_init(dev);
...@@ -508,7 +508,7 @@ static void rtw_ndev_uninit(struct net_device *dev) ...@@ -508,7 +508,7 @@ static void rtw_ndev_uninit(struct net_device *dev)
{ {
struct adapter *adapter = rtw_netdev_priv(dev); struct adapter *adapter = rtw_netdev_priv(dev);
DBG_871X_LEVEL(_drv_always_, FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(adapter)); DBG_871X_LEVEL(_drv_always_, FUNC_ADPT_FMT "\n", FUNC_ADPT_ARG(adapter));
rtw_adapter_proc_deinit(dev); rtw_adapter_proc_deinit(dev);
} }
...@@ -985,7 +985,7 @@ int _netdev_open(struct net_device *pnetdev) ...@@ -985,7 +985,7 @@ int _netdev_open(struct net_device *pnetdev)
goto netdev_open_error; goto netdev_open_error;
} }
DBG_871X("MAC Address = "MAC_FMT"\n", MAC_ARG(pnetdev->dev_addr)); DBG_871X("MAC Address = " MAC_FMT "\n", MAC_ARG(pnetdev->dev_addr));
status = rtw_start_drv_threads(padapter); status = rtw_start_drv_threads(padapter);
if (status == _FAIL) { if (status == _FAIL) {
...@@ -1204,7 +1204,7 @@ static int netdev_close(struct net_device *pnetdev) ...@@ -1204,7 +1204,7 @@ static int netdev_close(struct net_device *pnetdev)
void rtw_ndev_destructor(struct net_device *ndev) void rtw_ndev_destructor(struct net_device *ndev)
{ {
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); DBG_871X(FUNC_NDEV_FMT "\n", FUNC_NDEV_ARG(ndev));
if (ndev->ieee80211_ptr) if (ndev->ieee80211_ptr)
kfree((u8 *)ndev->ieee80211_ptr); kfree((u8 *)ndev->ieee80211_ptr);
...@@ -1293,7 +1293,7 @@ static int rtw_suspend_free_assoc_resource(struct adapter *padapter) ...@@ -1293,7 +1293,7 @@ static int rtw_suspend_free_assoc_resource(struct adapter *padapter)
{ {
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
DBG_871X("==> "FUNC_ADPT_FMT" entry....\n", FUNC_ADPT_ARG(padapter)); DBG_871X("==> " FUNC_ADPT_FMT " entry....\n", FUNC_ADPT_ARG(padapter));
if (rtw_chk_roam_flags(padapter, RTW_ROAM_ON_RESUME)) { if (rtw_chk_roam_flags(padapter, RTW_ROAM_ON_RESUME)) {
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)
...@@ -1334,7 +1334,7 @@ static int rtw_suspend_free_assoc_resource(struct adapter *padapter) ...@@ -1334,7 +1334,7 @@ static int rtw_suspend_free_assoc_resource(struct adapter *padapter)
rtw_indicate_disconnect(padapter); rtw_indicate_disconnect(padapter);
} }
DBG_871X("<== "FUNC_ADPT_FMT" exit....\n", FUNC_ADPT_ARG(padapter)); DBG_871X("<== " FUNC_ADPT_FMT " exit....\n", FUNC_ADPT_ARG(padapter));
return _SUCCESS; return _SUCCESS;
} }
...@@ -1348,7 +1348,7 @@ int rtw_suspend_wow(struct adapter *padapter) ...@@ -1348,7 +1348,7 @@ int rtw_suspend_wow(struct adapter *padapter)
struct wowlan_ioctl_param poidparam; struct wowlan_ioctl_param poidparam;
int ret = _SUCCESS; int ret = _SUCCESS;
DBG_871X("==> "FUNC_ADPT_FMT" entry....\n", FUNC_ADPT_ARG(padapter)); DBG_871X("==> " FUNC_ADPT_FMT " entry....\n", FUNC_ADPT_ARG(padapter));
DBG_871X("wowlan_mode: %d\n", pwrpriv->wowlan_mode); DBG_871X("wowlan_mode: %d\n", pwrpriv->wowlan_mode);
...@@ -1402,7 +1402,7 @@ int rtw_suspend_wow(struct adapter *padapter) ...@@ -1402,7 +1402,7 @@ int rtw_suspend_wow(struct adapter *padapter)
} }
if (rtw_get_ch_setting_union(padapter, &ch, &bw, &offset) != 0) { if (rtw_get_ch_setting_union(padapter, &ch, &bw, &offset) != 0) {
DBG_871X(FUNC_ADPT_FMT" back to linked/linking union - ch:%u, bw:%u, offset:%u\n", DBG_871X(FUNC_ADPT_FMT " back to linked/linking union - ch:%u, bw:%u, offset:%u\n",
FUNC_ADPT_ARG(padapter), ch, bw, offset); FUNC_ADPT_ARG(padapter), ch, bw, offset);
set_channel_bwmode(padapter, ch, offset, bw); set_channel_bwmode(padapter, ch, offset, bw);
} }
...@@ -1417,7 +1417,7 @@ int rtw_suspend_wow(struct adapter *padapter) ...@@ -1417,7 +1417,7 @@ int rtw_suspend_wow(struct adapter *padapter)
{ {
DBG_871X_LEVEL(_drv_always_, "%s: ### ERROR ### wowlan_mode =%d\n", __func__, pwrpriv->wowlan_mode); DBG_871X_LEVEL(_drv_always_, "%s: ### ERROR ### wowlan_mode =%d\n", __func__, pwrpriv->wowlan_mode);
} }
DBG_871X("<== "FUNC_ADPT_FMT" exit....\n", FUNC_ADPT_ARG(padapter)); DBG_871X("<== " FUNC_ADPT_FMT " exit....\n", FUNC_ADPT_ARG(padapter));
return ret; return ret;
} }
#endif /* ifdef CONFIG_WOWLAN */ #endif /* ifdef CONFIG_WOWLAN */
...@@ -1431,7 +1431,7 @@ int rtw_suspend_ap_wow(struct adapter *padapter) ...@@ -1431,7 +1431,7 @@ int rtw_suspend_ap_wow(struct adapter *padapter)
struct wowlan_ioctl_param poidparam; struct wowlan_ioctl_param poidparam;
int ret = _SUCCESS; int ret = _SUCCESS;
DBG_871X("==> "FUNC_ADPT_FMT" entry....\n", FUNC_ADPT_ARG(padapter)); DBG_871X("==> " FUNC_ADPT_FMT " entry....\n", FUNC_ADPT_ARG(padapter));
pwrpriv->wowlan_ap_mode = true; pwrpriv->wowlan_ap_mode = true;
...@@ -1463,14 +1463,14 @@ int rtw_suspend_ap_wow(struct adapter *padapter) ...@@ -1463,14 +1463,14 @@ int rtw_suspend_ap_wow(struct adapter *padapter)
DBG_871X_LEVEL(_drv_always_, "%s: wowmode suspending\n", __func__); DBG_871X_LEVEL(_drv_always_, "%s: wowmode suspending\n", __func__);
if (rtw_get_ch_setting_union(padapter, &ch, &bw, &offset) != 0) { if (rtw_get_ch_setting_union(padapter, &ch, &bw, &offset) != 0) {
DBG_871X(FUNC_ADPT_FMT" back to linked/linking union - ch:%u, bw:%u, offset:%u\n", DBG_871X(FUNC_ADPT_FMT " back to linked/linking union - ch:%u, bw:%u, offset:%u\n",
FUNC_ADPT_ARG(padapter), ch, bw, offset); FUNC_ADPT_ARG(padapter), ch, bw, offset);
set_channel_bwmode(padapter, ch, offset, bw); set_channel_bwmode(padapter, ch, offset, bw);
} }
rtw_set_ps_mode(padapter, PS_MODE_MIN, 0, 0, "AP-WOWLAN"); rtw_set_ps_mode(padapter, PS_MODE_MIN, 0, 0, "AP-WOWLAN");
DBG_871X("<== "FUNC_ADPT_FMT" exit....\n", FUNC_ADPT_ARG(padapter)); DBG_871X("<== " FUNC_ADPT_FMT " exit....\n", FUNC_ADPT_ARG(padapter));
return ret; return ret;
} }
#endif /* ifdef CONFIG_AP_WOWLAN */ #endif /* ifdef CONFIG_AP_WOWLAN */
...@@ -1481,7 +1481,7 @@ static int rtw_suspend_normal(struct adapter *padapter) ...@@ -1481,7 +1481,7 @@ static int rtw_suspend_normal(struct adapter *padapter)
struct net_device *pnetdev = padapter->pnetdev; struct net_device *pnetdev = padapter->pnetdev;
int ret = _SUCCESS; int ret = _SUCCESS;
DBG_871X("==> "FUNC_ADPT_FMT" entry....\n", FUNC_ADPT_ARG(padapter)); DBG_871X("==> " FUNC_ADPT_FMT " entry....\n", FUNC_ADPT_ARG(padapter));
if (pnetdev) { if (pnetdev) {
netif_carrier_off(pnetdev); netif_carrier_off(pnetdev);
rtw_netif_stop_queue(pnetdev); rtw_netif_stop_queue(pnetdev);
...@@ -1502,7 +1502,7 @@ static int rtw_suspend_normal(struct adapter *padapter) ...@@ -1502,7 +1502,7 @@ static int rtw_suspend_normal(struct adapter *padapter)
if (padapter->intf_deinit) if (padapter->intf_deinit)
padapter->intf_deinit(adapter_to_dvobj(padapter)); padapter->intf_deinit(adapter_to_dvobj(padapter));
DBG_871X("<== "FUNC_ADPT_FMT" exit....\n", FUNC_ADPT_ARG(padapter)); DBG_871X("<== " FUNC_ADPT_FMT " exit....\n", FUNC_ADPT_ARG(padapter));
return ret; return ret;
} }
...@@ -1600,7 +1600,7 @@ int rtw_resume_process_wow(struct adapter *padapter) ...@@ -1600,7 +1600,7 @@ int rtw_resume_process_wow(struct adapter *padapter)
struct sta_info *psta = NULL; struct sta_info *psta = NULL;
int ret = _SUCCESS; int ret = _SUCCESS;
DBG_871X("==> "FUNC_ADPT_FMT" entry....\n", FUNC_ADPT_ARG(padapter)); DBG_871X("==> " FUNC_ADPT_FMT " entry....\n", FUNC_ADPT_ARG(padapter));
if (padapter) { if (padapter) {
pnetdev = padapter->pnetdev; pnetdev = padapter->pnetdev;
...@@ -1711,7 +1711,7 @@ int rtw_resume_process_wow(struct adapter *padapter) ...@@ -1711,7 +1711,7 @@ int rtw_resume_process_wow(struct adapter *padapter)
/* clean driver side wake up reason. */ /* clean driver side wake up reason. */
pwrpriv->wowlan_wake_reason = 0; pwrpriv->wowlan_wake_reason = 0;
exit: exit:
DBG_871X("<== "FUNC_ADPT_FMT" exit....\n", FUNC_ADPT_ARG(padapter)); DBG_871X("<== " FUNC_ADPT_FMT " exit....\n", FUNC_ADPT_ARG(padapter));
return ret; return ret;
} }
#endif /* ifdef CONFIG_WOWLAN */ #endif /* ifdef CONFIG_WOWLAN */
...@@ -1726,7 +1726,7 @@ int rtw_resume_process_ap_wow(struct adapter *padapter) ...@@ -1726,7 +1726,7 @@ int rtw_resume_process_ap_wow(struct adapter *padapter)
struct wowlan_ioctl_param poidparam; struct wowlan_ioctl_param poidparam;
int ret = _SUCCESS; int ret = _SUCCESS;
DBG_871X("==> "FUNC_ADPT_FMT" entry....\n", FUNC_ADPT_ARG(padapter)); DBG_871X("==> " FUNC_ADPT_FMT " entry....\n", FUNC_ADPT_ARG(padapter));
if (padapter) { if (padapter) {
pnetdev = padapter->pnetdev; pnetdev = padapter->pnetdev;
...@@ -1786,7 +1786,7 @@ int rtw_resume_process_ap_wow(struct adapter *padapter) ...@@ -1786,7 +1786,7 @@ int rtw_resume_process_ap_wow(struct adapter *padapter)
/* clean driver side wake up reason. */ /* clean driver side wake up reason. */
pwrpriv->wowlan_wake_reason = 0; pwrpriv->wowlan_wake_reason = 0;
exit: exit:
DBG_871X("<== "FUNC_ADPT_FMT" exit....\n", FUNC_ADPT_ARG(padapter)); DBG_871X("<== " FUNC_ADPT_FMT " exit....\n", FUNC_ADPT_ARG(padapter));
return ret; return ret;
} }
#endif /* ifdef CONFIG_APWOWLAN */ #endif /* ifdef CONFIG_APWOWLAN */
...@@ -1812,7 +1812,7 @@ static int rtw_resume_process_normal(struct adapter *padapter) ...@@ -1812,7 +1812,7 @@ static int rtw_resume_process_normal(struct adapter *padapter)
psdpriv = padapter->dvobj; psdpriv = padapter->dvobj;
pdbgpriv = &psdpriv->drv_dbg; pdbgpriv = &psdpriv->drv_dbg;
DBG_871X("==> "FUNC_ADPT_FMT" entry....\n", FUNC_ADPT_ARG(padapter)); DBG_871X("==> " FUNC_ADPT_FMT " entry....\n", FUNC_ADPT_ARG(padapter));
/* interface init */ /* interface init */
/* if (sdio_init(adapter_to_dvobj(padapter)) != _SUCCESS) */ /* if (sdio_init(adapter_to_dvobj(padapter)) != _SUCCESS) */
if ((padapter->intf_init) && (padapter->intf_init(adapter_to_dvobj(padapter)) != _SUCCESS)) if ((padapter->intf_init) && (padapter->intf_init(adapter_to_dvobj(padapter)) != _SUCCESS))
...@@ -1850,21 +1850,21 @@ static int rtw_resume_process_normal(struct adapter *padapter) ...@@ -1850,21 +1850,21 @@ static int rtw_resume_process_normal(struct adapter *padapter)
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) { if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)) {
DBG_871X(FUNC_ADPT_FMT" fwstate:0x%08x - WIFI_STATION_STATE\n", FUNC_ADPT_ARG(padapter), get_fwstate(pmlmepriv)); DBG_871X(FUNC_ADPT_FMT " fwstate:0x%08x - WIFI_STATION_STATE\n", FUNC_ADPT_ARG(padapter), get_fwstate(pmlmepriv));
if (rtw_chk_roam_flags(padapter, RTW_ROAM_ON_RESUME)) if (rtw_chk_roam_flags(padapter, RTW_ROAM_ON_RESUME))
rtw_roaming(padapter, NULL); rtw_roaming(padapter, NULL);
} else if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) { } else if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) {
DBG_871X(FUNC_ADPT_FMT" fwstate:0x%08x - WIFI_AP_STATE\n", FUNC_ADPT_ARG(padapter), get_fwstate(pmlmepriv)); DBG_871X(FUNC_ADPT_FMT " fwstate:0x%08x - WIFI_AP_STATE\n", FUNC_ADPT_ARG(padapter), get_fwstate(pmlmepriv));
rtw_ap_restore_network(padapter); rtw_ap_restore_network(padapter);
} else if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) { } else if (check_fwstate(pmlmepriv, WIFI_ADHOC_STATE)) {
DBG_871X(FUNC_ADPT_FMT" fwstate:0x%08x - WIFI_ADHOC_STATE\n", FUNC_ADPT_ARG(padapter), get_fwstate(pmlmepriv)); DBG_871X(FUNC_ADPT_FMT " fwstate:0x%08x - WIFI_ADHOC_STATE\n", FUNC_ADPT_ARG(padapter), get_fwstate(pmlmepriv));
} else { } else {
DBG_871X(FUNC_ADPT_FMT" fwstate:0x%08x - ???\n", FUNC_ADPT_ARG(padapter), get_fwstate(pmlmepriv)); DBG_871X(FUNC_ADPT_FMT " fwstate:0x%08x - ???\n", FUNC_ADPT_ARG(padapter), get_fwstate(pmlmepriv));
} }
DBG_871X("<== "FUNC_ADPT_FMT" exit....\n", FUNC_ADPT_ARG(padapter)); DBG_871X("<== " FUNC_ADPT_FMT " exit....\n", FUNC_ADPT_ARG(padapter));
exit: exit:
return ret; return ret;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7