Linux kernel coding style uses one space around most binary and ternary
operators and spaces are prohibited at the start of a line. Concatenated
strings should have space between elements and space is required after ','.
In conditional statements, do not use unnecessary braces where a single
statement will do and put the opening brace last on the line, and put
the closing brace first. Unnecessary spaces and blank lines should be
avoided.
Harsha Sharma (10):
staging: rtl8723bs: Add spaces around '='
staging: rtl8723bs: Add spaces around '+', '|', '*'
staging: rtl8723bs: Add spaces around '?', '==', '||', '!='
staging: rtl8723bs: Remove unnecessary spaces at the start of line
staging: rtl8723bs: Add space between concatenated strings
staging: rtl8723bs: Add space after ','
staging: rtl8723bs: Removed unneccesary space
staging: rtl8723bs: Remove unnecessary space
staging: rtl8723bs: Remove unneccesary braces and change position of
open brace
staging: rtl8723bs: Remove unnecessary blank lines
drivers/staging/rtl8723bs/os_dep/os_intfs.c | 190 ++++++++++++----------------
1 file changed, 78 insertions(+), 112 deletions(-)
--
1.9.1
Use one space around (on each side of) '=' operator
Signed-off-by: Harsha Sharma <[email protected]>
---
drivers/staging/rtl8723bs/os_dep/os_intfs.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index 0215899..7f22ca9 100644
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -121,7 +121,7 @@
static int rtw_enusbss = 0;/* 0:disable, 1:enable */
-static int rtw_hwpdn_mode =2;/* 0:disable, 1:enable, 2: by EFUSE config */
+static int rtw_hwpdn_mode = 2;/* 0:disable, 1:enable, 2: by EFUSE config */
#ifdef CONFIG_HW_PWRP_DETECTION
static int rtw_hwpwrp_detect = 1;
@@ -183,7 +183,7 @@
module_param(rtw_hw_wps_pbc, int, 0644);
-static uint rtw_max_roaming_times =2;
+static uint rtw_max_roaming_times = 2;
module_param(rtw_max_roaming_times, uint, 0644);
MODULE_PARM_DESC(rtw_max_roaming_times,"The max roaming times to try");
@@ -255,8 +255,8 @@ static uint loadparam(struct adapter *padapter, _nic_hdl pnetdev)
registry_par->vrtl_carrier_sense = (u8)rtw_vrtl_carrier_sense ;
registry_par->vcs_type = (u8)rtw_vcs_type;
- registry_par->rts_thresh =(u16)rtw_rts_thresh;
- registry_par->frag_thresh =(u16)rtw_frag_thresh;
+ registry_par->rts_thresh = (u16)rtw_rts_thresh;
+ registry_par->frag_thresh = (u16)rtw_frag_thresh;
registry_par->preamble = (u8)rtw_preamble;
registry_par->scan_mode = (u8)rtw_scan_mode;
registry_par->adhoc_tx_pwr = (u8)rtw_adhoc_tx_pwr;
@@ -652,8 +652,8 @@ static u8 rtw_init_default_value(struct adapter *padapter)
#ifdef CONFIG_GTK_OL
psecuritypriv->binstallKCK_KEK = _FAIL;
#endif /* CONFIG_GTK_OL */
- psecuritypriv->sw_encrypt =pregistrypriv->software_encrypt;
- psecuritypriv->sw_decrypt =pregistrypriv->software_decrypt;
+ psecuritypriv->sw_encrypt = pregistrypriv->software_encrypt;
+ psecuritypriv->sw_decrypt = pregistrypriv->software_decrypt;
psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Open; /* open system */
psecuritypriv->dot11PrivacyAlgrthm = _NO_PRIVACY_;
@@ -777,7 +777,7 @@ u8 rtw_init_drv_sw(struct adapter *padapter)
goto exit;
}
- padapter->cmdpriv.padapter =padapter;
+ padapter->cmdpriv.padapter = padapter;
if ((rtw_init_evt_priv(&padapter->evtpriv)) == _FAIL) {
RT_TRACE(_module_os_intfs_c_, _drv_err_, ("\n Can't init evt_priv\n"));
@@ -986,7 +986,7 @@ int _netdev_open(struct net_device *pnetdev)
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) {
DBG_871X("Initialize driver software resource Failed!\n");
goto netdev_open_error;
@@ -1641,7 +1641,7 @@ int rtw_resume_process_wow(struct adapter *padapter)
}
/* Disable WOW, set H2C command */
- poidparam.subcode =WOWLAN_DISABLE;
+ poidparam.subcode = WOWLAN_DISABLE;
padapter->HalFunc.SetHwRegHandler(padapter, HW_VAR_WOWLAN, (u8 *)&poidparam);
psta = rtw_get_stainfo(&padapter->stapriv, get_bssid(&padapter->mlmepriv));
@@ -1705,7 +1705,7 @@ int rtw_resume_process_wow(struct adapter *padapter)
DBG_871X_LEVEL(_drv_always_, "do not reset timer\n");
}
- pwrpriv->wowlan_mode =false;
+ pwrpriv->wowlan_mode = false;
/* clean driver side wake up reason. */
pwrpriv->wowlan_wake_reason = 0;
--
1.9.1
Use one space around most binary operators
Signed-off-by: Harsha Sharma <[email protected]>
---
drivers/staging/rtl8723bs/os_dep/os_intfs.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index 7f22ca9..18f0ac2 100644
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -222,7 +222,7 @@
/* BIT4 - RF, 0: non-support, 1: support */
/* BIT5 - RF_TXPWR_TRACK, 0: non-support, 1: support */
/* BIT6 - RF_TXPWR_LMT, 0: non-support, 1: support */
-static int rtw_load_phy_file = (BIT2|BIT6);
+static int rtw_load_phy_file = (BIT2 | BIT6);
module_param(rtw_load_phy_file, int, 0644);
MODULE_PARM_DESC(rtw_load_phy_file,"PHY File Bit Map");
static int rtw_decrypt_phy_file = 0;
@@ -440,12 +440,12 @@ u16 rtw_recv_select_queue(struct sk_buff *skb)
u32 priority;
u8 *pdata = skb->data;
- memcpy(ð_type, pdata+(ETH_ALEN<<1), 2);
+ memcpy(ð_type, pdata + (ETH_ALEN << 1), 2);
switch (be16_to_cpu(eth_type)) {
case ETH_P_IP:
- piphdr = (struct iphdr *)(pdata+ETH_HLEN);
+ piphdr = (struct iphdr *)(pdata + ETH_HLEN);
dscp = piphdr->tos & 0xfc;
@@ -561,7 +561,7 @@ struct net_device *rtw_init_netdev(struct adapter *old_padapter)
pnetdev->netdev_ops = &rtw_netdev_ops;
/* pnetdev->tx_timeout = NULL; */
- pnetdev->watchdog_timeo = HZ*3; /* 3 second timeout */
+ pnetdev->watchdog_timeo = HZ * 3; /* 3 second timeout */
pnetdev->wireless_handlers = (struct iw_handler_def *)&rtw_handlers_def;
/* step 2. */
@@ -748,7 +748,7 @@ u8 rtw_reset_drv_sw(struct adapter *padapter)
pmlmepriv->LinkDetectInfo.TrafficTransitionCount = 0;
pmlmepriv->LinkDetectInfo.LowPowerTransitionCount = 0;
- _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY |_FW_UNDER_LINKING);
+ _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY | _FW_UNDER_LINKING);
pwrctrlpriv->pwr_state_check_cnts = 0;
@@ -935,7 +935,7 @@ static int _rtw_drv_register_netdev(struct adapter *padapter, char *name)
goto error_register_netdev;
}
- DBG_871X("%s, MAC Address (if%d) = " MAC_FMT "\n", __func__, (padapter->iface_id+1), MAC_ARG(pnetdev->dev_addr));
+ DBG_871X("%s, MAC Address (if%d) = " MAC_FMT "\n", __func__, (padapter->iface_id + 1), MAC_ARG(pnetdev->dev_addr));
return ret;
--
1.9.1
Use spaces around most binary operators
Signed-off-by: Harsha Sharma <[email protected]>
---
drivers/staging/rtl8723bs/os_dep/os_intfs.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index 18f0ac2..5ceccd7 100644
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -1140,7 +1140,7 @@ static int pm_netdev_open(struct net_device *pnetdev, u8 bnormal)
}
}
else
- status = (_SUCCESS == ips_netdrv_open(padapter))?(0):(-1);
+ status = (_SUCCESS == ips_netdrv_open(padapter)) ? (0) : (-1);
return status;
}
@@ -1262,7 +1262,7 @@ void rtw_dev_unload(struct adapter *padapter)
rtw_btcoex_IpsNotify(padapter, pwrctl->ips_mode_req);
#ifdef CONFIG_WOWLAN
if (pwrctl->bSupportRemoteWakeup == true &&
- pwrctl->wowlan_mode ==true) {
+ pwrctl->wowlan_mode == true) {
DBG_871X_LEVEL(_drv_always_, "%s bSupportRemoteWakeup ==true do not run rtw_hal_deinit()\n", __func__);
}
else
@@ -1524,7 +1524,7 @@ int rtw_suspend_common(struct adapter *padapter)
while (pwrpriv->bips_processing == true)
msleep(1);
- if ((!padapter->bup) || (padapter->bDriverStopped)||(padapter->bSurpriseRemoved))
+ if ((!padapter->bup) || (padapter->bDriverStopped) || (padapter->bSurpriseRemoved))
{
DBG_871X("%s bup =%d bDriverStopped =%d bSurpriseRemoved = %d\n", __func__
, padapter->bup, padapter->bDriverStopped, padapter->bSurpriseRemoved);
@@ -1671,7 +1671,7 @@ int rtw_resume_process_wow(struct adapter *padapter)
DBG_871X_LEVEL(_drv_always_, "%s: ### ERROR ### wowlan_mode =%d\n", __func__, pwrpriv->wowlan_mode);
}
- if (padapter->pid[1]!= 0) {
+ if (padapter->pid[1] != 0) {
DBG_871X("pid[1]:%d\n", padapter->pid[1]);
rtw_signal_process(padapter->pid[1], SIGUSR2);
}
@@ -1774,7 +1774,7 @@ int rtw_resume_process_ap_wow(struct adapter *padapter)
rtw_netif_wake_queue(pnetdev);
}
- if (padapter->pid[1]!= 0) {
+ if (padapter->pid[1] != 0) {
DBG_871X("pid[1]:%d\n", padapter->pid[1]);
rtw_signal_process(padapter->pid[1], SIGUSR2);
}
@@ -1842,7 +1842,7 @@ static int rtw_resume_process_normal(struct adapter *padapter)
netif_device_attach(pnetdev);
netif_carrier_on(pnetdev);
- if (padapter->pid[1]!= 0) {
+ if (padapter->pid[1] != 0) {
DBG_871X("pid[1]:%d\n", padapter->pid[1]);
rtw_signal_process(padapter->pid[1], SIGUSR2);
}
--
1.9.1
No spaces at the start of a line
Signed-off-by: Harsha Sharma <[email protected]>
---
drivers/staging/rtl8723bs/os_dep/os_intfs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index 5ceccd7..97ff3ab 100644
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -597,7 +597,7 @@ u32 rtw_start_drv_threads(struct adapter *padapter)
_status = _FAIL;
padapter->cmdThread = kthread_run(rtw_cmd_thread, padapter, "RTW_CMD_THREAD");
- if (IS_ERR(padapter->cmdThread))
+ if (IS_ERR(padapter->cmdThread))
_status = _FAIL;
else
down(&padapter->cmdpriv.terminate_cmdthread_sema); /* wait for cmd_thread to run */
--
1.9.1
Use spaces between concatenated strings
Signed-off-by: Harsha Sharma <[email protected]>
---
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
Space required after ','
Signed-off-by: Harsha Sharma <[email protected]>
---
drivers/staging/rtl8723bs/os_dep/os_intfs.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index b320df8..ecb01cf 100644
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -45,7 +45,7 @@
static int rtw_power_mgnt = 1;
static int rtw_ips_mode = IPS_NORMAL;
module_param(rtw_ips_mode, int, 0644);
-MODULE_PARM_DESC(rtw_ips_mode,"The default IPS mode");
+MODULE_PARM_DESC(rtw_ips_mode, "The default IPS mode");
static int rtw_smart_ps = 2;
@@ -185,7 +185,7 @@
static uint rtw_max_roaming_times = 2;
module_param(rtw_max_roaming_times, uint, 0644);
-MODULE_PARM_DESC(rtw_max_roaming_times,"The max roaming times to try");
+MODULE_PARM_DESC(rtw_max_roaming_times, "The max roaming times to try");
module_param(rtw_mc2u_disable, int, 0644);
@@ -206,10 +206,10 @@
static int rtw_tx_pwr_by_rate = 0;
module_param(rtw_tx_pwr_lmt_enable, int, 0644);
-MODULE_PARM_DESC(rtw_tx_pwr_lmt_enable,"0:Disable, 1:Enable, 2: Depend on efuse");
+MODULE_PARM_DESC(rtw_tx_pwr_lmt_enable, "0:Disable, 1:Enable, 2: Depend on efuse");
module_param(rtw_tx_pwr_by_rate, int, 0644);
-MODULE_PARM_DESC(rtw_tx_pwr_by_rate,"0:Disable, 1:Enable, 2: Depend on efuse");
+MODULE_PARM_DESC(rtw_tx_pwr_by_rate, "0:Disable, 1:Enable, 2: Depend on efuse");
char *rtw_phy_file_path = "";
module_param(rtw_phy_file_path, charp, 0644);
@@ -224,10 +224,10 @@
/* BIT6 - RF_TXPWR_LMT, 0: non-support, 1: support */
static int rtw_load_phy_file = (BIT2 | BIT6);
module_param(rtw_load_phy_file, int, 0644);
-MODULE_PARM_DESC(rtw_load_phy_file,"PHY File Bit Map");
+MODULE_PARM_DESC(rtw_load_phy_file, "PHY File Bit Map");
static int rtw_decrypt_phy_file = 0;
module_param(rtw_decrypt_phy_file, int, 0644);
-MODULE_PARM_DESC(rtw_decrypt_phy_file,"Enable Decrypt PHY File");
+MODULE_PARM_DESC(rtw_decrypt_phy_file, "Enable Decrypt PHY File");
int _netdev_open(struct net_device *pnetdev);
int netdev_open (struct net_device *pnetdev);
--
1.9.1
Remove space between function name and open parenthesis '('
Signed-off-by: Harsha Sharma <[email protected]>
---
drivers/staging/rtl8723bs/os_dep/os_intfs.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index ecb01cf..8e13fb3 100644
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -230,8 +230,8 @@
MODULE_PARM_DESC(rtw_decrypt_phy_file, "Enable Decrypt PHY File");
int _netdev_open(struct net_device *pnetdev);
-int netdev_open (struct net_device *pnetdev);
-static int netdev_close (struct net_device *pnetdev);
+int netdev_open(struct net_device *pnetdev);
+static int netdev_close(struct net_device *pnetdev);
static uint loadparam(struct adapter *padapter, _nic_hdl pnetdev)
{
@@ -606,7 +606,7 @@ u32 rtw_start_drv_threads(struct adapter *padapter)
return _status;
}
-void rtw_stop_drv_threads (struct adapter *padapter)
+void rtw_stop_drv_threads(struct adapter *padapter)
{
RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+rtw_stop_drv_threads\n"));
--
1.9.1
Remove space before ';', '++', ','
Signed-off-by: Harsha Sharma <[email protected]>
---
drivers/staging/rtl8723bs/os_dep/os_intfs.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index 8e13fb3..7a2d088 100644
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -253,7 +253,7 @@ static uint loadparam(struct adapter *padapter, _nic_hdl pnetdev)
if (registry_par->channel > 14)
registry_par->channel = 1;
- registry_par->vrtl_carrier_sense = (u8)rtw_vrtl_carrier_sense ;
+ registry_par->vrtl_carrier_sense = (u8)rtw_vrtl_carrier_sense;
registry_par->vcs_type = (u8)rtw_vcs_type;
registry_par->rts_thresh = (u16)rtw_rts_thresh;
registry_par->frag_thresh = (u16)rtw_frag_thresh;
@@ -1240,7 +1240,7 @@ void rtw_dev_unload(struct adapter *padapter)
DBG_871X("stop cmdthd timeout\n");
break;
} else {
- cnt ++;
+ cnt++;
DBG_871X("cmdthd is running(%d)\n", cnt);
msleep(10);
}
@@ -1907,7 +1907,7 @@ int rtw_resume_common(struct adapter *padapter)
pwrpriv->pno_in_resume = false;
#endif
}
- DBG_871X_LEVEL(_drv_always_, "%s:%d in %d ms\n", __func__ , ret,
+ DBG_871X_LEVEL(_drv_always_, "%s:%d in %d ms\n", __func__, ret,
jiffies_to_msecs(jiffies - start_time));
return ret;
--
1.9.1
Follow linux-kernel code style for conditional statements
Signed-off-by: Harsha Sharma <[email protected]>
---
drivers/staging/rtl8723bs/os_dep/os_intfs.c | 63 +++++++++--------------------
1 file changed, 19 insertions(+), 44 deletions(-)
diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index 7a2d088..fb8502a 100644
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -351,8 +351,7 @@ static int rtw_net_set_mac_address(struct net_device *pnetdev, void *p)
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
struct sockaddr *addr = p;
- if (padapter->bup == false)
- {
+ if (padapter->bup == false) {
/* DBG_871X("r8711_net_set_mac_address(), MAC =%x:%x:%x:%x:%x:%x\n", addr->sa_data[0], addr->sa_data[1], addr->sa_data[2], addr->sa_data[3], */
/* addr->sa_data[4], addr->sa_data[5]); */
memcpy(padapter->eeprompriv.mac_addr, addr->sa_data, ETH_ALEN);
@@ -425,9 +424,7 @@ static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb
skb->priority = rtw_classify8021d(skb);
if (pmlmepriv->acm_mask != 0)
- {
skb->priority = qos_acm(pmlmepriv->acm_mask, skb->priority);
- }
return rtw_1d_to_queue[skb->priority];
}
@@ -1036,8 +1033,7 @@ int netdev_open(struct net_device *pnetdev)
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
struct pwrctrl_priv *pwrctrlpriv = adapter_to_pwrctl(padapter);
- if (pwrctrlpriv->bInSuspend == true)
- {
+ if (pwrctrlpriv->bInSuspend == true) {
DBG_871X("+871x_drv - drv_open, bInSuspend =%d\n", pwrctrlpriv->bInSuspend);
return 0;
}
@@ -1066,16 +1062,13 @@ static int ips_netdrv_open(struct adapter *padapter)
/* padapter->bup = true; */
status = rtw_hal_init(padapter);
- if (status == _FAIL)
- {
+ if (status == _FAIL) {
RT_TRACE(_module_os_intfs_c_, _drv_err_, ("ips_netdrv_open(): Can't init h/w!\n"));
goto netdev_open_error;
}
if (padapter->intf_start)
- {
padapter->intf_start(padapter);
- }
_set_timer(&padapter->mlmepriv.dynamic_chk_timer, 2000);
@@ -1119,9 +1112,7 @@ void rtw_ips_dev_unload(struct adapter *padapter)
if (padapter->bSurpriseRemoved == false)
- {
rtw_hal_deinit(padapter);
- }
}
@@ -1132,8 +1123,7 @@ static int pm_netdev_open(struct net_device *pnetdev, u8 bnormal)
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev);
- if (true == bnormal)
- {
+ if (true == bnormal) {
if (mutex_lock_interruptible(&(adapter_to_dvobj(padapter)->hw_init_mutex)) == 0) {
status = _netdev_open(pnetdev);
mutex_unlock(&(adapter_to_dvobj(padapter)->hw_init_mutex));
@@ -1152,8 +1142,7 @@ static int netdev_close(struct net_device *pnetdev)
RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+871x_drv - drv_close\n"));
- if (pwrctl->bInternalAutoSuspend == true)
- {
+ if (pwrctl->bInternalAutoSuspend == true) {
/* rtw_pwr_wakeup(padapter); */
if (pwrctl->rf_pwrstate == rf_off)
pwrctl->ps_flag = true;
@@ -1174,8 +1163,7 @@ static int netdev_close(struct net_device *pnetdev)
DBG_871X("(2)871x_drv - drv_close, bup =%d, hw_init_completed =%d\n", padapter->bup, padapter->hw_init_completed);
/* s1. */
- if (pnetdev)
- {
+ if (pnetdev) {
if (!rtw_netif_queue_stopped(pnetdev))
rtw_netif_stop_queue(pnetdev);
}
@@ -1219,8 +1207,7 @@ void rtw_dev_unload(struct adapter *padapter)
RT_TRACE(_module_hci_intfs_c_, _drv_notice_, ("+%s\n", __func__));
- if (padapter->bup == true)
- {
+ if (padapter->bup == true) {
DBG_871X("===> %s\n", __func__);
padapter->bDriverStopped = true;
@@ -1257,8 +1244,7 @@ void rtw_dev_unload(struct adapter *padapter)
DBG_871X_LEVEL(_drv_always_, "%s: driver not in IPS\n", __func__);
}
- if (padapter->bSurpriseRemoved == false)
- {
+ if (padapter->bSurpriseRemoved == false) {
rtw_btcoex_IpsNotify(padapter, pwrctl->ips_mode_req);
#ifdef CONFIG_WOWLAN
if (pwrctl->bSupportRemoteWakeup == true &&
@@ -1296,8 +1282,7 @@ static int rtw_suspend_free_assoc_resource(struct adapter *padapter)
if (rtw_chk_roam_flags(padapter, RTW_ROAM_ON_RESUME)) {
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)
- && check_fwstate(pmlmepriv, _FW_LINKED))
- {
+ && check_fwstate(pmlmepriv, _FW_LINKED)) {
DBG_871X("%s %s(" MAC_FMT "), length:%d assoc_ssid.length:%d\n", __func__,
pmlmepriv->cur_network.network.Ssid.Ssid,
MAC_ARG(pmlmepriv->cur_network.network.MacAddress),
@@ -1307,14 +1292,12 @@ static int rtw_suspend_free_assoc_resource(struct adapter *padapter)
}
}
- if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) && check_fwstate(pmlmepriv, _FW_LINKED))
- {
+ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) && check_fwstate(pmlmepriv, _FW_LINKED)) {
rtw_disassoc_cmd(padapter, 0, false);
/* s2-2. indicate disconnect to os */
rtw_indicate_disconnect(padapter);
}
- else if (check_fwstate(pmlmepriv, WIFI_AP_STATE))
- {
+ else if (check_fwstate(pmlmepriv, WIFI_AP_STATE)) {
rtw_sta_flush(padapter);
}
@@ -1327,8 +1310,7 @@ static int rtw_suspend_free_assoc_resource(struct adapter *padapter)
if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY))
rtw_indicate_scan_done(padapter, 1);
- if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == true)
- {
+ if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == true) {
DBG_871X_LEVEL(_drv_always_, "%s: fw_under_linking\n", __func__);
rtw_indicate_disconnect(padapter);
}
@@ -1379,8 +1361,7 @@ int rtw_suspend_wow(struct adapter *padapter)
padapter->HalFunc.SetHwRegHandler(padapter, HW_VAR_WOWLAN, (u8 *)&poidparam);
if (rtw_chk_roam_flags(padapter, RTW_ROAM_ON_RESUME)) {
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)
- && check_fwstate(pmlmepriv, _FW_LINKED))
- {
+ && check_fwstate(pmlmepriv, _FW_LINKED)) {
DBG_871X("%s %s(" MAC_FMT "), length:%d assoc_ssid.length:%d\n", __func__,
pmlmepriv->cur_network.network.Ssid.Ssid,
MAC_ARG(pmlmepriv->cur_network.network.MacAddress),
@@ -1393,8 +1374,7 @@ int rtw_suspend_wow(struct adapter *padapter)
DBG_871X_LEVEL(_drv_always_, "%s: wowmode suspending\n", __func__);
- if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true)
- {
+ if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true) {
DBG_871X_LEVEL(_drv_always_, "%s: fw_under_survey\n", __func__);
rtw_indicate_scan_done(padapter, 1);
clr_fwstate(pmlmepriv, _FW_UNDER_SURVEY);
@@ -1412,8 +1392,7 @@ int rtw_suspend_wow(struct adapter *padapter)
rtw_set_ps_mode(padapter, PS_MODE_DTIM, 0, 0, "WOWLAN");
}
- else
- {
+ else {
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));
@@ -1489,8 +1468,7 @@ static int rtw_suspend_normal(struct adapter *padapter)
rtw_suspend_free_assoc_resource(padapter);
if ((rtw_hal_check_ips_status(padapter) == true)
- || (adapter_to_pwrctl(padapter)->rf_pwrstate == rf_off))
- {
+ || (adapter_to_pwrctl(padapter)->rf_pwrstate == rf_off)) {
DBG_871X_LEVEL(_drv_always_, "%s: ### ERROR #### driver in IPS ####ERROR###!!!\n", __func__);
}
@@ -1524,8 +1502,7 @@ int rtw_suspend_common(struct adapter *padapter)
while (pwrpriv->bips_processing == true)
msleep(1);
- if ((!padapter->bup) || (padapter->bDriverStopped) || (padapter->bSurpriseRemoved))
- {
+ if ((!padapter->bup) || (padapter->bDriverStopped) || (padapter->bSurpriseRemoved)) {
DBG_871X("%s bup =%d bDriverStopped =%d bSurpriseRemoved = %d\n", __func__
, padapter->bup, padapter->bDriverStopped, padapter->bSurpriseRemoved);
pdbgpriv->dbg_suspend_error_cnt++;
@@ -1814,16 +1791,14 @@ static int rtw_resume_process_normal(struct adapter *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))
- {
+ if ((padapter->intf_init) && (padapter->intf_init(adapter_to_dvobj(padapter)) != _SUCCESS)) {
ret = -1;
RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("%s: initialize SDIO Failed!!\n", __func__));
goto exit;
}
rtw_hal_disable_interrupt(padapter);
/* if (sdio_alloc_irq(adapter_to_dvobj(padapter)) != _SUCCESS) */
- if ((padapter->intf_alloc_irq) && (padapter->intf_alloc_irq(adapter_to_dvobj(padapter)) != _SUCCESS))
- {
+ if ((padapter->intf_alloc_irq) && (padapter->intf_alloc_irq(adapter_to_dvobj(padapter)) != _SUCCESS)) {
ret = -1;
RT_TRACE(_module_hci_intfs_c_, _drv_err_, ("%s: sdio_alloc_irq Failed!!\n", __func__));
goto exit;
--
1.9.1
Blank lines aren't necessary after an open brace and before a close brace
Signed-off-by: Harsha Sharma <[email protected]>
---
drivers/staging/rtl8723bs/os_dep/os_intfs.c | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index fb8502a..5cca7a9 100644
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -454,7 +454,6 @@ u16 rtw_recv_select_queue(struct sk_buff *skb)
}
return rtw_1d_to_queue[priority];
-
}
static int rtw_ndev_notifier_call(struct notifier_block * nb, unsigned long state, void *ptr)
@@ -1024,7 +1023,6 @@ int _netdev_open(struct net_device *pnetdev)
DBG_871X("-871x_drv - drv_open fail, bup =%d\n", padapter->bup);
return (-1);
-
}
int netdev_open(struct net_device *pnetdev)
@@ -1091,7 +1089,6 @@ int rtw_ips_pwr_up(struct adapter *padapter)
DBG_871X("<=== rtw_ips_pwr_up..............\n");
return result;
-
}
void rtw_ips_pwr_down(struct adapter *padapter)
@@ -1113,7 +1110,6 @@ void rtw_ips_dev_unload(struct adapter *padapter)
if (padapter->bSurpriseRemoved == false)
rtw_hal_deinit(padapter);
-
}
@@ -1186,7 +1182,6 @@ static int netdev_close(struct net_device *pnetdev)
DBG_871X("-871x_drv - drv_close, bup =%d\n", padapter->bup);
return 0;
-
}
void rtw_ndev_destructor(struct net_device *ndev)
@@ -1390,7 +1385,6 @@ int rtw_suspend_wow(struct adapter *padapter)
DBG_871X_LEVEL(_drv_always_, "%s: pno: %d\n", __func__, pwrpriv->wowlan_pno_enable);
else
rtw_set_ps_mode(padapter, PS_MODE_DTIM, 0, 0, "WOWLAN");
-
}
else {
DBG_871X_LEVEL(_drv_always_, "%s: ### ERROR ### wowlan_mode =%d\n", __func__, pwrpriv->wowlan_mode);
@@ -1470,7 +1464,6 @@ static int rtw_suspend_normal(struct adapter *padapter)
if ((rtw_hal_check_ips_status(padapter) == true)
|| (adapter_to_pwrctl(padapter)->rf_pwrstate == rf_off)) {
DBG_871X_LEVEL(_drv_always_, "%s: ### ERROR #### driver in IPS ####ERROR###!!!\n", __func__);
-
}
rtw_dev_unload(padapter);
@@ -1644,7 +1637,6 @@ int rtw_resume_process_wow(struct adapter *padapter)
}
}
else {
-
DBG_871X_LEVEL(_drv_always_, "%s: ### ERROR ### wowlan_mode =%d\n", __func__, pwrpriv->wowlan_mode);
}
@@ -1657,7 +1649,6 @@ int rtw_resume_process_wow(struct adapter *padapter)
if (pwrpriv->wowlan_wake_reason == FWDecisionDisconnect ||
pwrpriv->wowlan_wake_reason == Rx_DisAssoc ||
pwrpriv->wowlan_wake_reason == Rx_DeAuth) {
-
DBG_871X("%s: disconnect reason: %02x\n", __func__,
pwrpriv->wowlan_wake_reason);
rtw_indicate_disconnect(padapter);
--
1.9.1
On Sun, 10 Sep 2017, Harsha Sharma wrote:
> Use one space around most binary operators
>
> Signed-off-by: Harsha Sharma <[email protected]>
Acked-by: Julia Lawall <[email protected]>
> ---
> drivers/staging/rtl8723bs/os_dep/os_intfs.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
> index 7f22ca9..18f0ac2 100644
> --- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
> +++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
> @@ -222,7 +222,7 @@
> /* BIT4 - RF, 0: non-support, 1: support */
> /* BIT5 - RF_TXPWR_TRACK, 0: non-support, 1: support */
> /* BIT6 - RF_TXPWR_LMT, 0: non-support, 1: support */
> -static int rtw_load_phy_file = (BIT2|BIT6);
> +static int rtw_load_phy_file = (BIT2 | BIT6);
> module_param(rtw_load_phy_file, int, 0644);
> MODULE_PARM_DESC(rtw_load_phy_file,"PHY File Bit Map");
> static int rtw_decrypt_phy_file = 0;
> @@ -440,12 +440,12 @@ u16 rtw_recv_select_queue(struct sk_buff *skb)
> u32 priority;
> u8 *pdata = skb->data;
>
> - memcpy(ð_type, pdata+(ETH_ALEN<<1), 2);
> + memcpy(ð_type, pdata + (ETH_ALEN << 1), 2);
>
> switch (be16_to_cpu(eth_type)) {
> case ETH_P_IP:
>
> - piphdr = (struct iphdr *)(pdata+ETH_HLEN);
> + piphdr = (struct iphdr *)(pdata + ETH_HLEN);
>
> dscp = piphdr->tos & 0xfc;
>
> @@ -561,7 +561,7 @@ struct net_device *rtw_init_netdev(struct adapter *old_padapter)
> pnetdev->netdev_ops = &rtw_netdev_ops;
>
> /* pnetdev->tx_timeout = NULL; */
> - pnetdev->watchdog_timeo = HZ*3; /* 3 second timeout */
> + pnetdev->watchdog_timeo = HZ * 3; /* 3 second timeout */
> pnetdev->wireless_handlers = (struct iw_handler_def *)&rtw_handlers_def;
>
> /* step 2. */
> @@ -748,7 +748,7 @@ u8 rtw_reset_drv_sw(struct adapter *padapter)
> pmlmepriv->LinkDetectInfo.TrafficTransitionCount = 0;
> pmlmepriv->LinkDetectInfo.LowPowerTransitionCount = 0;
>
> - _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY |_FW_UNDER_LINKING);
> + _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY | _FW_UNDER_LINKING);
>
> pwrctrlpriv->pwr_state_check_cnts = 0;
>
> @@ -935,7 +935,7 @@ static int _rtw_drv_register_netdev(struct adapter *padapter, char *name)
> goto error_register_netdev;
> }
>
> - DBG_871X("%s, MAC Address (if%d) = " MAC_FMT "\n", __func__, (padapter->iface_id+1), MAC_ARG(pnetdev->dev_addr));
> + DBG_871X("%s, MAC Address (if%d) = " MAC_FMT "\n", __func__, (padapter->iface_id + 1), MAC_ARG(pnetdev->dev_addr));
>
> return ret;
>
> --
> 1.9.1
>
> --
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
> To post to this group, send email to [email protected].
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/28be543667f44c31e38872ec4a96bad8c167e3d8.1505052882.git.harshasharmaiitr%40gmail.com.
> For more options, visit https://groups.google.com/d/optout.
>
On Sun, 10 Sep 2017, Harsha Sharma wrote:
> Use one space around (on each side of) '=' operator
>
> Signed-off-by: Harsha Sharma <[email protected]>
Acked-by: Julia Lawall <[email protected]>
> ---
> drivers/staging/rtl8723bs/os_dep/os_intfs.c | 20 ++++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
> index 0215899..7f22ca9 100644
> --- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
> +++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
> @@ -121,7 +121,7 @@
>
> static int rtw_enusbss = 0;/* 0:disable, 1:enable */
>
> -static int rtw_hwpdn_mode =2;/* 0:disable, 1:enable, 2: by EFUSE config */
> +static int rtw_hwpdn_mode = 2;/* 0:disable, 1:enable, 2: by EFUSE config */
>
> #ifdef CONFIG_HW_PWRP_DETECTION
> static int rtw_hwpwrp_detect = 1;
> @@ -183,7 +183,7 @@
>
> module_param(rtw_hw_wps_pbc, int, 0644);
>
> -static uint rtw_max_roaming_times =2;
> +static uint rtw_max_roaming_times = 2;
> module_param(rtw_max_roaming_times, uint, 0644);
> MODULE_PARM_DESC(rtw_max_roaming_times,"The max roaming times to try");
>
> @@ -255,8 +255,8 @@ static uint loadparam(struct adapter *padapter, _nic_hdl pnetdev)
>
> registry_par->vrtl_carrier_sense = (u8)rtw_vrtl_carrier_sense ;
> registry_par->vcs_type = (u8)rtw_vcs_type;
> - registry_par->rts_thresh =(u16)rtw_rts_thresh;
> - registry_par->frag_thresh =(u16)rtw_frag_thresh;
> + registry_par->rts_thresh = (u16)rtw_rts_thresh;
> + registry_par->frag_thresh = (u16)rtw_frag_thresh;
> registry_par->preamble = (u8)rtw_preamble;
> registry_par->scan_mode = (u8)rtw_scan_mode;
> registry_par->adhoc_tx_pwr = (u8)rtw_adhoc_tx_pwr;
> @@ -652,8 +652,8 @@ static u8 rtw_init_default_value(struct adapter *padapter)
> #ifdef CONFIG_GTK_OL
> psecuritypriv->binstallKCK_KEK = _FAIL;
> #endif /* CONFIG_GTK_OL */
> - psecuritypriv->sw_encrypt =pregistrypriv->software_encrypt;
> - psecuritypriv->sw_decrypt =pregistrypriv->software_decrypt;
> + psecuritypriv->sw_encrypt = pregistrypriv->software_encrypt;
> + psecuritypriv->sw_decrypt = pregistrypriv->software_decrypt;
>
> psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_Open; /* open system */
> psecuritypriv->dot11PrivacyAlgrthm = _NO_PRIVACY_;
> @@ -777,7 +777,7 @@ u8 rtw_init_drv_sw(struct adapter *padapter)
> goto exit;
> }
>
> - padapter->cmdpriv.padapter =padapter;
> + padapter->cmdpriv.padapter = padapter;
>
> if ((rtw_init_evt_priv(&padapter->evtpriv)) == _FAIL) {
> RT_TRACE(_module_os_intfs_c_, _drv_err_, ("\n Can't init evt_priv\n"));
> @@ -986,7 +986,7 @@ int _netdev_open(struct net_device *pnetdev)
>
> 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) {
> DBG_871X("Initialize driver software resource Failed!\n");
> goto netdev_open_error;
> @@ -1641,7 +1641,7 @@ int rtw_resume_process_wow(struct adapter *padapter)
> }
>
> /* Disable WOW, set H2C command */
> - poidparam.subcode =WOWLAN_DISABLE;
> + poidparam.subcode = WOWLAN_DISABLE;
> padapter->HalFunc.SetHwRegHandler(padapter, HW_VAR_WOWLAN, (u8 *)&poidparam);
>
> psta = rtw_get_stainfo(&padapter->stapriv, get_bssid(&padapter->mlmepriv));
> @@ -1705,7 +1705,7 @@ int rtw_resume_process_wow(struct adapter *padapter)
> DBG_871X_LEVEL(_drv_always_, "do not reset timer\n");
> }
>
> - pwrpriv->wowlan_mode =false;
> + pwrpriv->wowlan_mode = false;
>
> /* clean driver side wake up reason. */
> pwrpriv->wowlan_wake_reason = 0;
> --
> 1.9.1
>
> --
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
> To post to this group, send email to [email protected].
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/7b2a57c6f3eb01142a73e92124fdf06a7504e68e.1505052882.git.harshasharmaiitr%40gmail.com.
> For more options, visit https://groups.google.com/d/optout.
>
On Sun, 10 Sep 2017, Harsha Sharma wrote:
> Use spaces around most binary operators
>
> Signed-off-by: Harsha Sharma <[email protected]>
Acked-by: Julia Lawall <[email protected]>
> ---
> drivers/staging/rtl8723bs/os_dep/os_intfs.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
> index 18f0ac2..5ceccd7 100644
> --- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
> +++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
> @@ -1140,7 +1140,7 @@ static int pm_netdev_open(struct net_device *pnetdev, u8 bnormal)
> }
> }
> else
> - status = (_SUCCESS == ips_netdrv_open(padapter))?(0):(-1);
> + status = (_SUCCESS == ips_netdrv_open(padapter)) ? (0) : (-1);
>
> return status;
> }
> @@ -1262,7 +1262,7 @@ void rtw_dev_unload(struct adapter *padapter)
> rtw_btcoex_IpsNotify(padapter, pwrctl->ips_mode_req);
> #ifdef CONFIG_WOWLAN
> if (pwrctl->bSupportRemoteWakeup == true &&
> - pwrctl->wowlan_mode ==true) {
> + pwrctl->wowlan_mode == true) {
> DBG_871X_LEVEL(_drv_always_, "%s bSupportRemoteWakeup ==true do not run rtw_hal_deinit()\n", __func__);
> }
> else
> @@ -1524,7 +1524,7 @@ int rtw_suspend_common(struct adapter *padapter)
> while (pwrpriv->bips_processing == true)
> msleep(1);
>
> - if ((!padapter->bup) || (padapter->bDriverStopped)||(padapter->bSurpriseRemoved))
> + if ((!padapter->bup) || (padapter->bDriverStopped) || (padapter->bSurpriseRemoved))
> {
> DBG_871X("%s bup =%d bDriverStopped =%d bSurpriseRemoved = %d\n", __func__
> , padapter->bup, padapter->bDriverStopped, padapter->bSurpriseRemoved);
> @@ -1671,7 +1671,7 @@ int rtw_resume_process_wow(struct adapter *padapter)
> DBG_871X_LEVEL(_drv_always_, "%s: ### ERROR ### wowlan_mode =%d\n", __func__, pwrpriv->wowlan_mode);
> }
>
> - if (padapter->pid[1]!= 0) {
> + if (padapter->pid[1] != 0) {
> DBG_871X("pid[1]:%d\n", padapter->pid[1]);
> rtw_signal_process(padapter->pid[1], SIGUSR2);
> }
> @@ -1774,7 +1774,7 @@ int rtw_resume_process_ap_wow(struct adapter *padapter)
> rtw_netif_wake_queue(pnetdev);
> }
>
> - if (padapter->pid[1]!= 0) {
> + if (padapter->pid[1] != 0) {
> DBG_871X("pid[1]:%d\n", padapter->pid[1]);
> rtw_signal_process(padapter->pid[1], SIGUSR2);
> }
> @@ -1842,7 +1842,7 @@ static int rtw_resume_process_normal(struct adapter *padapter)
> netif_device_attach(pnetdev);
> netif_carrier_on(pnetdev);
>
> - if (padapter->pid[1]!= 0) {
> + if (padapter->pid[1] != 0) {
> DBG_871X("pid[1]:%d\n", padapter->pid[1]);
> rtw_signal_process(padapter->pid[1], SIGUSR2);
> }
> --
> 1.9.1
>
> --
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
> To post to this group, send email to [email protected].
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/be22d7c63780098571fec9d490b1a83039ddbb75.1505052882.git.harshasharmaiitr%40gmail.com.
> For more options, visit https://groups.google.com/d/optout.
>
Add unnecessary typos by copying the necessary typos.
Signed-off-by: Joe Perches <[email protected]>
---
?scripts/spelling.txt | 4 ++++
?1 file changed, 4 insertions(+)
diff --git a/scripts/spelling.txt b/scripts/spelling.txt
index 400ef35169c5..e16d8f8e8bea 100644
--- a/scripts/spelling.txt
+++ b/scripts/spelling.txt
@@ -1155,6 +1155,10 @@ unknonw||unknown
?unknow||unknown
?unkown||unknown
?unneded||unneeded
+unneccecary||unnecessary
+unneccesary||unnecessary
+unneccessary||unnecessary
+unnecesary||unnecessary
?unneedingly||unnecessarily
?unnsupported||unsupported
?unmached||unmatched
On Sun, 10 Sep 2017, Harsha Sharma wrote:
> No spaces at the start of a line
>
> Signed-off-by: Harsha Sharma <[email protected]>
Acked-by: Julia Lawall <[email protected]>
> ---
> drivers/staging/rtl8723bs/os_dep/os_intfs.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
> index 5ceccd7..97ff3ab 100644
> --- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
> +++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
> @@ -597,7 +597,7 @@ u32 rtw_start_drv_threads(struct adapter *padapter)
> _status = _FAIL;
>
> padapter->cmdThread = kthread_run(rtw_cmd_thread, padapter, "RTW_CMD_THREAD");
> - if (IS_ERR(padapter->cmdThread))
> + if (IS_ERR(padapter->cmdThread))
> _status = _FAIL;
> else
> down(&padapter->cmdpriv.terminate_cmdthread_sema); /* wait for cmd_thread to run */
> --
> 1.9.1
>
> --
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
> To post to this group, send email to [email protected].
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/94120b866c10e83ec66c8b96522ae7d265d254cc.1505052882.git.harshasharmaiitr%40gmail.com.
> For more options, visit https://groups.google.com/d/optout.
>
On Sun, 10 Sep 2017, Harsha Sharma wrote:
> Use spaces between concatenated strings
Perhaps all the entry/exit ones could be dropped, and the ohters could be
rewritten to use more standard kernel debugging functionalities.
julia
>
> Signed-off-by: Harsha Sharma <[email protected]>
> ---
> 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
>
> --
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
> To post to this group, send email to [email protected].
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/86078625c574018711c48bf66ebb5f62d540ac79.1505052882.git.harshasharmaiitr%40gmail.com.
> For more options, visit https://groups.google.com/d/optout.
>
On Sun, 10 Sep 2017, Harsha Sharma wrote:
> Space required after ','
>
> Signed-off-by: Harsha Sharma <[email protected]>
Acked-by: Julia Lawall <[email protected]>
> ---
> drivers/staging/rtl8723bs/os_dep/os_intfs.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
> index b320df8..ecb01cf 100644
> --- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
> +++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
> @@ -45,7 +45,7 @@
> static int rtw_power_mgnt = 1;
> static int rtw_ips_mode = IPS_NORMAL;
> module_param(rtw_ips_mode, int, 0644);
> -MODULE_PARM_DESC(rtw_ips_mode,"The default IPS mode");
> +MODULE_PARM_DESC(rtw_ips_mode, "The default IPS mode");
>
> static int rtw_smart_ps = 2;
>
> @@ -185,7 +185,7 @@
>
> static uint rtw_max_roaming_times = 2;
> module_param(rtw_max_roaming_times, uint, 0644);
> -MODULE_PARM_DESC(rtw_max_roaming_times,"The max roaming times to try");
> +MODULE_PARM_DESC(rtw_max_roaming_times, "The max roaming times to try");
>
> module_param(rtw_mc2u_disable, int, 0644);
>
> @@ -206,10 +206,10 @@
> static int rtw_tx_pwr_by_rate = 0;
>
> module_param(rtw_tx_pwr_lmt_enable, int, 0644);
> -MODULE_PARM_DESC(rtw_tx_pwr_lmt_enable,"0:Disable, 1:Enable, 2: Depend on efuse");
> +MODULE_PARM_DESC(rtw_tx_pwr_lmt_enable, "0:Disable, 1:Enable, 2: Depend on efuse");
>
> module_param(rtw_tx_pwr_by_rate, int, 0644);
> -MODULE_PARM_DESC(rtw_tx_pwr_by_rate,"0:Disable, 1:Enable, 2: Depend on efuse");
> +MODULE_PARM_DESC(rtw_tx_pwr_by_rate, "0:Disable, 1:Enable, 2: Depend on efuse");
>
> char *rtw_phy_file_path = "";
> module_param(rtw_phy_file_path, charp, 0644);
> @@ -224,10 +224,10 @@
> /* BIT6 - RF_TXPWR_LMT, 0: non-support, 1: support */
> static int rtw_load_phy_file = (BIT2 | BIT6);
> module_param(rtw_load_phy_file, int, 0644);
> -MODULE_PARM_DESC(rtw_load_phy_file,"PHY File Bit Map");
> +MODULE_PARM_DESC(rtw_load_phy_file, "PHY File Bit Map");
> static int rtw_decrypt_phy_file = 0;
> module_param(rtw_decrypt_phy_file, int, 0644);
> -MODULE_PARM_DESC(rtw_decrypt_phy_file,"Enable Decrypt PHY File");
> +MODULE_PARM_DESC(rtw_decrypt_phy_file, "Enable Decrypt PHY File");
>
> int _netdev_open(struct net_device *pnetdev);
> int netdev_open (struct net_device *pnetdev);
> --
> 1.9.1
>
> --
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
> To post to this group, send email to [email protected].
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/f38c5d1ba5518dce605cd9eb5d7adbdee3f7544d.1505052882.git.harshasharmaiitr%40gmail.com.
> For more options, visit https://groups.google.com/d/optout.
>
On Sun, Sep 10, 2017 at 11:02:02PM +0530, Harsha Sharma wrote:
> Space required after ','
>
> Signed-off-by: Harsha Sharma <[email protected]>
> Acked-by: Julia Lawall <[email protected]>
This patch does not apply, can you rebase and resend?
thanks,
greg k-h
On Sun, Sep 10, 2017 at 11:04:34PM +0530, Harsha Sharma wrote:
> Remove space between function name and open parenthesis '('
>
> Signed-off-by: Harsha Sharma <[email protected]>
> ---
> drivers/staging/rtl8723bs/os_dep/os_intfs.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
This and patch 8/10, have the same subject line (well, one letter
different), yet they do different things, please either merge them
together or give them better names.
thanks,
greg k-h
Remove space between function name and open parenthesis '('
Remove space before ';', '++', ','
Signed-off-by: Harsha Sharma <[email protected]>
---
Change in v2:
-Merge patches 07/10 and 08/10
drivers/staging/rtl8723bs/os_dep/os_intfs.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index eb21821..61be2b8 100644
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -235,8 +235,8 @@
MODULE_PARM_DESC(rtw_decrypt_phy_file, "Enable Decrypt PHY File");
int _netdev_open(struct net_device *pnetdev);
-int netdev_open (struct net_device *pnetdev);
-static int netdev_close (struct net_device *pnetdev);
+int netdev_open(struct net_device *pnetdev);
+static int netdev_close(struct net_device *pnetdev);
static uint loadparam(struct adapter *padapter, _nic_hdl pnetdev)
{
@@ -258,7 +258,7 @@ static uint loadparam(struct adapter *padapter, _nic_hdl pnetdev)
if (registry_par->channel > 14)
registry_par->channel = 1;
- registry_par->vrtl_carrier_sense = (u8)rtw_vrtl_carrier_sense ;
+ registry_par->vrtl_carrier_sense = (u8)rtw_vrtl_carrier_sense;
registry_par->vcs_type = (u8)rtw_vcs_type;
registry_par->rts_thresh = (u16)rtw_rts_thresh;
registry_par->frag_thresh = (u16)rtw_frag_thresh;
@@ -607,7 +607,7 @@ u32 rtw_start_drv_threads(struct adapter *padapter)
return _status;
}
-void rtw_stop_drv_threads (struct adapter *padapter)
+void rtw_stop_drv_threads(struct adapter *padapter)
{
RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+rtw_stop_drv_threads\n"));
@@ -1228,7 +1228,7 @@ void rtw_dev_unload(struct adapter *padapter)
DBG_871X("stop cmdthd timeout\n");
break;
} else {
- cnt ++;
+ cnt++;
DBG_871X("cmdthd is running(%d)\n", cnt);
msleep(10);
}
@@ -1879,7 +1879,7 @@ int rtw_resume_common(struct adapter *padapter)
pwrpriv->pno_in_resume = false;
#endif
}
- DBG_871X_LEVEL(_drv_always_, "%s:%d in %d ms\n", __func__ , ret,
+ DBG_871X_LEVEL(_drv_always_, "%s:%d in %d ms\n", __func__, ret,
jiffies_to_msecs(jiffies - start_time));
return ret;
--
1.9.1
It'sa small detail, but perhaps you could fix the spelling of unnecessary
(1 c and 2 s's).
julia
On Tue, 12 Sep 2017, Harsha Sharma wrote:
> Remove space between function name and open parenthesis '('
> Remove space before ';', '++', ','
>
> Signed-off-by: Harsha Sharma <[email protected]>
> ---
> Change in v2:
> -Merge patches 07/10 and 08/10
>
> drivers/staging/rtl8723bs/os_dep/os_intfs.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
> index eb21821..61be2b8 100644
> --- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
> +++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
> @@ -235,8 +235,8 @@
> MODULE_PARM_DESC(rtw_decrypt_phy_file, "Enable Decrypt PHY File");
>
> int _netdev_open(struct net_device *pnetdev);
> -int netdev_open (struct net_device *pnetdev);
> -static int netdev_close (struct net_device *pnetdev);
> +int netdev_open(struct net_device *pnetdev);
> +static int netdev_close(struct net_device *pnetdev);
>
> static uint loadparam(struct adapter *padapter, _nic_hdl pnetdev)
> {
> @@ -258,7 +258,7 @@ static uint loadparam(struct adapter *padapter, _nic_hdl pnetdev)
> if (registry_par->channel > 14)
> registry_par->channel = 1;
>
> - registry_par->vrtl_carrier_sense = (u8)rtw_vrtl_carrier_sense ;
> + registry_par->vrtl_carrier_sense = (u8)rtw_vrtl_carrier_sense;
> registry_par->vcs_type = (u8)rtw_vcs_type;
> registry_par->rts_thresh = (u16)rtw_rts_thresh;
> registry_par->frag_thresh = (u16)rtw_frag_thresh;
> @@ -607,7 +607,7 @@ u32 rtw_start_drv_threads(struct adapter *padapter)
> return _status;
> }
>
> -void rtw_stop_drv_threads (struct adapter *padapter)
> +void rtw_stop_drv_threads(struct adapter *padapter)
> {
> RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+rtw_stop_drv_threads\n"));
>
> @@ -1228,7 +1228,7 @@ void rtw_dev_unload(struct adapter *padapter)
> DBG_871X("stop cmdthd timeout\n");
> break;
> } else {
> - cnt ++;
> + cnt++;
> DBG_871X("cmdthd is running(%d)\n", cnt);
> msleep(10);
> }
> @@ -1879,7 +1879,7 @@ int rtw_resume_common(struct adapter *padapter)
> pwrpriv->pno_in_resume = false;
> #endif
> }
> - DBG_871X_LEVEL(_drv_always_, "%s:%d in %d ms\n", __func__ , ret,
> + DBG_871X_LEVEL(_drv_always_, "%s:%d in %d ms\n", __func__, ret,
> jiffies_to_msecs(jiffies - start_time));
>
> return ret;
> --
> 1.9.1
>
> --
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
> To post to this group, send email to [email protected].
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/1505210936-24971-1-git-send-email-harshasharmaiitr%40gmail.com.
> For more options, visit https://groups.google.com/d/optout.
>
Remove space between function name and open parenthesis '('
Remove space before ';', '++', ','
Signed-off-by: Harsha Sharma <[email protected]>
---
Change in v3:
-Fix small spelling mistake
Change in v2:
-Merge patches 07/10 and 08/10
drivers/staging/rtl8723bs/os_dep/os_intfs.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index eb21821..61be2b8 100644
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -235,8 +235,8 @@
MODULE_PARM_DESC(rtw_decrypt_phy_file, "Enable Decrypt PHY File");
int _netdev_open(struct net_device *pnetdev);
-int netdev_open (struct net_device *pnetdev);
-static int netdev_close (struct net_device *pnetdev);
+int netdev_open(struct net_device *pnetdev);
+static int netdev_close(struct net_device *pnetdev);
static uint loadparam(struct adapter *padapter, _nic_hdl pnetdev)
{
@@ -258,7 +258,7 @@ static uint loadparam(struct adapter *padapter, _nic_hdl pnetdev)
if (registry_par->channel > 14)
registry_par->channel = 1;
- registry_par->vrtl_carrier_sense = (u8)rtw_vrtl_carrier_sense ;
+ registry_par->vrtl_carrier_sense = (u8)rtw_vrtl_carrier_sense;
registry_par->vcs_type = (u8)rtw_vcs_type;
registry_par->rts_thresh = (u16)rtw_rts_thresh;
registry_par->frag_thresh = (u16)rtw_frag_thresh;
@@ -607,7 +607,7 @@ u32 rtw_start_drv_threads(struct adapter *padapter)
return _status;
}
-void rtw_stop_drv_threads (struct adapter *padapter)
+void rtw_stop_drv_threads(struct adapter *padapter)
{
RT_TRACE(_module_os_intfs_c_, _drv_info_, ("+rtw_stop_drv_threads\n"));
@@ -1228,7 +1228,7 @@ void rtw_dev_unload(struct adapter *padapter)
DBG_871X("stop cmdthd timeout\n");
break;
} else {
- cnt ++;
+ cnt++;
DBG_871X("cmdthd is running(%d)\n", cnt);
msleep(10);
}
@@ -1879,7 +1879,7 @@ int rtw_resume_common(struct adapter *padapter)
pwrpriv->pno_in_resume = false;
#endif
}
- DBG_871X_LEVEL(_drv_always_, "%s:%d in %d ms\n", __func__ , ret,
+ DBG_871X_LEVEL(_drv_always_, "%s:%d in %d ms\n", __func__, ret,
jiffies_to_msecs(jiffies - start_time));
return ret;
--
1.9.1
Space required after ','
Signed-off-by: Harsha Sharma <[email protected]>
---
Changes in v2:
-Rebase against staging-testing and solve merge conflicts
drivers/staging/rtl8723bs/os_dep/os_intfs.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
index b3635e2..22b9e1e 100644
--- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c
+++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c
@@ -45,7 +45,7 @@
static int rtw_power_mgnt = 1;
static int rtw_ips_mode = IPS_NORMAL;
module_param(rtw_ips_mode, int, 0644);
-MODULE_PARM_DESC(rtw_ips_mode,"The default IPS mode");
+MODULE_PARM_DESC(rtw_ips_mode, "The default IPS mode");
static int rtw_smart_ps = 2;
@@ -185,7 +185,7 @@
static uint rtw_max_roaming_times = 2;
module_param(rtw_max_roaming_times, uint, 0644);
-MODULE_PARM_DESC(rtw_max_roaming_times,"The max roaming times to try");
+MODULE_PARM_DESC(rtw_max_roaming_times, "The max roaming times to try");
module_param(rtw_mc2u_disable, int, 0644);
@@ -206,10 +206,10 @@
static int rtw_tx_pwr_by_rate;
module_param(rtw_tx_pwr_lmt_enable, int, 0644);
-MODULE_PARM_DESC(rtw_tx_pwr_lmt_enable,"0:Disable, 1:Enable, 2: Depend on efuse");
+MODULE_PARM_DESC(rtw_tx_pwr_lmt_enable, "0:Disable, 1:Enable, 2: Depend on efuse");
module_param(rtw_tx_pwr_by_rate, int, 0644);
-MODULE_PARM_DESC(rtw_tx_pwr_by_rate,"0:Disable, 1:Enable, 2: Depend on efuse");
+MODULE_PARM_DESC(rtw_tx_pwr_by_rate, "0:Disable, 1:Enable, 2: Depend on efuse");
char *rtw_phy_file_path = "";
module_param(rtw_phy_file_path, charp, 0644);
@@ -224,10 +224,10 @@
/* BIT6 - RF_TXPWR_LMT, 0: non-support, 1: support */
static int rtw_load_phy_file = (BIT2 | BIT6);
module_param(rtw_load_phy_file, int, 0644);
-MODULE_PARM_DESC(rtw_load_phy_file,"PHY File Bit Map");
+MODULE_PARM_DESC(rtw_load_phy_file, "PHY File Bit Map");
static int rtw_decrypt_phy_file;
module_param(rtw_decrypt_phy_file, int, 0644);
-MODULE_PARM_DESC(rtw_decrypt_phy_file,"Enable Decrypt PHY File");
+MODULE_PARM_DESC(rtw_decrypt_phy_file, "Enable Decrypt PHY File");
int _netdev_open(struct net_device *pnetdev);
int netdev_open (struct net_device *pnetdev);
--
1.9.1
On Tue, Sep 12, 2017 at 07:05:23PM +0530, Harsha Sharma wrote:
> Space required after ','
>
> Signed-off-by: Harsha Sharma <[email protected]>
> ---
> Changes in v2:
> -Rebase against staging-testing and solve merge conflicts
>
> drivers/staging/rtl8723bs/os_dep/os_intfs.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
Where are the rest of the patches in this series, I only seem to have 2
(patch 6 and patch 7 out of 10.)
If you have to resend patches, please always do so as a unique series,
If I have taken some of a previous series, please then send the new ones
out as a totally unique series, as that is what they now are.
Remember, make it totally obvious what I, as a maintainer, need to do
here. I have no memory of previous patch submissions, or what happened
on something else somewhere else. I deal with thousands of patches, and
as such, have no short-term memory :)
thanks,
greg k-h