lkml.org 
[lkml]   [2017]   [Sep]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 05/10] staging: rtl8723bs: Add space between concatenated strings
    Date
    Use spaces between concatenated strings

    Signed-off-by: Harsha Sharma <harshasharmaiitr@gmail.com>
    ---
    drivers/staging/rtl8723bs/os_dep/os_intfs.c | 50 ++++++++++++++---------------
    1 file changed, 25 insertions(+), 25 deletions(-)

    diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
    index 97ff3ab..b320df8 100644
    --- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
    +++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
    @@ -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)
    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) {
    case NETDEV_CHANGENAME:
    @@ -497,7 +497,7 @@ static int rtw_ndev_init(struct net_device *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);
    rtw_adapter_proc_init(dev);

    @@ -508,7 +508,7 @@ static void rtw_ndev_uninit(struct net_device *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);
    }

    @@ -984,7 +984,7 @@ int _netdev_open(struct net_device *pnetdev)
    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);
    if (status == _FAIL) {
    @@ -1203,7 +1203,7 @@ static int netdev_close(struct net_device *pnetdev)

    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)
    kfree((u8 *)ndev->ieee80211_ptr);
    @@ -1292,7 +1292,7 @@ static int rtw_suspend_free_assoc_resource(struct adapter *padapter)
    {
    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 (check_fwstate(pmlmepriv, WIFI_STATION_STATE)
    @@ -1333,7 +1333,7 @@ static int rtw_suspend_free_assoc_resource(struct adapter *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;
    }

    @@ -1347,7 +1347,7 @@ int rtw_suspend_wow(struct adapter *padapter)
    struct wowlan_ioctl_param poidparam;
    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);
    @@ -1401,7 +1401,7 @@ int rtw_suspend_wow(struct adapter *padapter)
    }

    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);
    set_channel_bwmode(padapter, ch, offset, bw);
    }
    @@ -1416,7 +1416,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("<== "FUNC_ADPT_FMT" exit....\n", FUNC_ADPT_ARG(padapter));
    + DBG_871X("<== " FUNC_ADPT_FMT " exit....\n", FUNC_ADPT_ARG(padapter));
    return ret;
    }
    #endif /* ifdef CONFIG_WOWLAN */
    @@ -1430,7 +1430,7 @@ int rtw_suspend_ap_wow(struct adapter *padapter)
    struct wowlan_ioctl_param poidparam;
    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;

    @@ -1462,14 +1462,14 @@ int rtw_suspend_ap_wow(struct adapter *padapter)
    DBG_871X_LEVEL(_drv_always_, "%s: wowmode suspending\n", __func__);

    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);
    set_channel_bwmode(padapter, ch, offset, bw);
    }

    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;
    }
    #endif /* ifdef CONFIG_AP_WOWLAN */
    @@ -1480,7 +1480,7 @@ static int rtw_suspend_normal(struct adapter *padapter)
    struct net_device *pnetdev = padapter->pnetdev;
    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) {
    netif_carrier_off(pnetdev);
    rtw_netif_stop_queue(pnetdev);
    @@ -1501,7 +1501,7 @@ static int rtw_suspend_normal(struct adapter *padapter)
    if (padapter->intf_deinit)
    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;
    }

    @@ -1599,7 +1599,7 @@ int rtw_resume_process_wow(struct adapter *padapter)
    struct sta_info *psta = NULL;
    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) {
    pnetdev = padapter->pnetdev;
    @@ -1710,7 +1710,7 @@ int rtw_resume_process_wow(struct adapter *padapter)
    /* clean driver side wake up reason. */
    pwrpriv->wowlan_wake_reason = 0;
    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;
    }
    #endif /* ifdef CONFIG_WOWLAN */
    @@ -1725,7 +1725,7 @@ int rtw_resume_process_ap_wow(struct adapter *padapter)
    struct wowlan_ioctl_param poidparam;
    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) {
    pnetdev = padapter->pnetdev;
    @@ -1785,7 +1785,7 @@ int rtw_resume_process_ap_wow(struct adapter *padapter)
    /* clean driver side wake up reason. */
    pwrpriv->wowlan_wake_reason = 0;
    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;
    }
    #endif /* ifdef CONFIG_APWOWLAN */
    @@ -1811,7 +1811,7 @@ static int rtw_resume_process_normal(struct adapter *padapter)
    psdpriv = padapter->dvobj;
    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 */
    /* if (sdio_init(adapter_to_dvobj(padapter)) != _SUCCESS) */
    if ((padapter->intf_init) && (padapter->intf_init(adapter_to_dvobj(padapter)) != _SUCCESS))
    @@ -1849,21 +1849,21 @@ static int rtw_resume_process_normal(struct adapter *padapter)


    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))
    rtw_roaming(padapter, NULL);

    } 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);
    } 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 {
    - 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:
    return ret;
    --
    1.9.1
    \
     
     \ /
      Last update: 2017-09-10 19:33    [W:4.142 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site