Skip to contentSkip to conversation

staging: rtl8723bs: os_dep: Fix coding style issues

PATCH In review Mamta Shukla 4 participants 9 messages Oct 11, 2018 – Oct 12, 2018 Staging

lore
Share & tools
lore
#0 lore raw

cover staging: rtl8723bs: os_dep: Fix coding style issues

This patch series fixes checkpatch issues such as:
-Remove true and false comparison
-Remove space after cast
-Shift * to be adjacent to pointer name to conform kernel coding style.

Mamta Shukla (3):
staging: rtl8723bs: os_dep: Remove true and false comparison
staging: rtl8723bs: os_dep: Remove space after cast
staging: rtl8723bs: os_dep: Shift * to be adjacent to pointer name

 drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 30 +++++++++++++-------------
 1 file changed, 15 insertions(+), 15 deletions(-)
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/3 staging: rtl8723bs: os_dep: Remove true and false comparison

Remove comparison to true and false in if statement. Issue found with checkpatch.pl
CHECK: Using comparison to true is error prone
CHECK: Using comparison to false is error prone

---
 drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +6 -6
index c38298d..48a1560 100644
@@ -209,9 +209,9 @@ static char *translate_scan(struct adapter *padapter,
 		i++;
 	}
 
-	if (vht_cap == true) {
+	if (vht_cap) {
 		max_rate = vht_data_rate;
-	} else if (ht_cap == true) {
+	} else if (ht_cap) {
 		if (mcs_rate&0x8000) { /* MCS15 */
 			max_rate = (bw_40MHz) ? ((short_GI)?300:270):((short_GI)?144:130);
 		} else if (mcs_rate&0x0080) { /* MCS7 */
@@ -862,7 +862,7 @@ static int rtw_wx_set_mode(struct net_device *dev, struct iw_request_info *a,
 		goto exit;
 	}
 
-	if (padapter->hw_init_completed ==false) {
+	if (!padapter->hw_init_completed) {
 		ret = -EPERM;
 		goto exit;
 	}
@@ -1295,7 +1295,7 @@ static int rtw_wx_set_scan(struct net_device *dev, struct iw_request_info *a,
 		goto exit;
 	}
 
-	if (padapter->hw_init_completed ==false) {
+	if (!padapter->hw_init_completed ) {
 		ret = -1;
 		goto exit;
 	}
@@ -1303,7 +1303,7 @@ static int rtw_wx_set_scan(struct net_device *dev, struct iw_request_info *a,
 	/*  When Busy Traffic, driver do not site survey. So driver return success. */
 	/*  wpa_supplicant will not issue SIOCSIWSCAN cmd again after scan timeout. */
 	/*  modify by thomas 2011-02-22. */
-	if (pmlmepriv->LinkDetectInfo.bBusyTraffic == true) {
+	if (pmlmepriv->LinkDetectInfo.bBusyTraffic) {
 		indicate_wx_scan_complete_event(padapter);
 		goto exit;
 	}
@@ -4229,7 +4229,7 @@ static int rtw_hostapd_ioctl(struct net_device *dev, struct iw_point *p)
 	* so, we just check hw_init_completed
 	*/
 
-	if (padapter->hw_init_completed ==false) {
+	if (!padapter->hw_init_completed) {
 		ret = -EPERM;
 		goto out;
 	}
Signature · 1 line
1.9.1
#2 lore raw

PATCH 2/3 staging: rtl8723bs: os_dep: Remove space after cast

In reply to Mamta Shukla

Remove space after cast to fix checkpatch issue.
CHECK: No space is necessary after a cast

---
 drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +7 -7
index 48a1560..243394e 100644
@@ -337,7 +337,7 @@ static char *translate_scan(struct adapter *padapter,
 
 
 	#ifdef CONFIG_SIGNAL_DISPLAY_DBM
-	iwe.u.qual.level = (u8) translate_percentage_to_dbm(ss);/* dbm */
+	iwe.u.qual.level = (u8)translate_percentage_to_dbm(ss);/* dbm */
 	#else
 	#ifdef CONFIG_SKIP_SIGNAL_SCALE_MAPPING
 	{
@@ -392,7 +392,7 @@ static char *translate_scan(struct adapter *padapter,
 
 static int wpa_set_auth_algs(struct net_device *dev, u32 value)
 {
-	struct adapter *padapter = (struct adapter *) rtw_netdev_priv(dev);
+	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
 	int ret = 0;
 
 	if ((value & WLAN_AUTH_SHARED_KEY) && (value & WLAN_AUTH_OPEN)) {
@@ -436,7 +436,7 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param,
 	param->u.crypt.err = 0;
 	param->u.crypt.alg[IEEE_CRYPT_ALG_NAME_LEN - 1] = '\0';
 
-	if (param_len < (u32) ((u8 *) param->u.crypt.key - (u8 *) param) + param->u.crypt.key_len) {
+	if (param_len < (u32)((u8 *)param->u.crypt.key - (u8 *)param) + param->u.crypt.key_len) {
 		ret =  -EINVAL;
 		goto exit;
 	}
@@ -946,7 +946,7 @@ static int rtw_wx_set_pmkid(struct net_device *dev,
 	u8          j, blInserted = false;
 	int         intReturn = false;
 	struct security_priv *psecuritypriv = &padapter->securitypriv;
-        struct iw_pmksa*  pPMK = (struct iw_pmksa*) extra;
+        struct iw_pmksa*  pPMK = (struct iw_pmksa*)extra;
         u8     strZeroMacAddress[ ETH_ALEN ] = { 0x00 };
         u8     strIssueBssid[ ETH_ALEN ] = { 0x00 };
 
@@ -1236,7 +1236,7 @@ static int rtw_wx_set_mlme(struct net_device *dev,
 	int ret = 0;
 	u16 reason;
 	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
-	struct iw_mlme *mlme = (struct iw_mlme *) extra;
+	struct iw_mlme *mlme = (struct iw_mlme *)extra;
 
 
 	if (mlme == NULL)
@@ -2390,7 +2390,7 @@ static int rtw_wx_set_channel_plan(struct net_device *dev,
                                union iwreq_data *wrqu, char *extra)
 {
 	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);
-	u8 channel_plan_req = (u8) (*((int *)wrqu));
+	u8 channel_plan_req = (u8)(*((int *)wrqu));
 
 	if (_SUCCESS == rtw_set_chplan_cmd(padapter, channel_plan_req, 1, 1))
 		DBG_871X("%s set channel_plan = 0x%02X\n", __func__, channel_plan_req);
@@ -2584,7 +2584,7 @@ static int rtw_wps_start(struct net_device *dev,
 		goto exit;
 	}
 
-	uintRet = copy_from_user((void*) &u32wps_start, pdata->pointer, 4);
+	uintRet = copy_from_user((void*)&u32wps_start, pdata->pointer, 4);
 	if (u32wps_start == 0)
 		u32wps_start = *extra;
 
Signature · 1 line
1.9.1
#3 lore raw

PATCH 3/3 staging: rtl8723bs: os_dep: Shift * to be adjacent to pointer name

In reply to Mamta Shukla

Shift * to be adjacent to pointer name to follow Linux coding style. Issue found with checkpatch.pl
ERROR: "foo * bar" should be "foo *bar"

---
 drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +2 -2
index 243394e..28bfdbd 100644
@@ -528,8 +528,8 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param,
 	}
 
 	if (padapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) { /*  802_1x */
-		struct sta_info * psta,*pbcmc_sta;
-		struct sta_priv * pstapriv = &padapter->stapriv;
+		struct sta_info *psta, *pbcmc_sta;
+		struct sta_priv *pstapriv = &padapter->stapriv;
 
 		
Signature · 1 line
1.9.1
maintainer
#4 lore raw

Re: [Outreachy kernel] [PATCH 3/3] staging: rtl8723bs: os_dep: Shift * to be adjacent to pointer name

Quoted 9 lines · Mamta Shukla

Shift * to be adjacent to pointer name to follow Linux coding style. Issue found with checkpatch.pl
ERROR: "foo * bar" should be "foo *bar"

---
 drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

This patch is somehow corrupted. Can you fix it up and resend it, keeping Larry's ack?

thanks,

greg k-h

#5 lore raw

Re: [Outreachy kernel] [PATCH 3/3] staging: rtl8723bs: os_dep: Shift * to be adjacent to pointer name

In reply to Mamta Shukla
Quoted 6 lines · Mamta Shukla

Shift * to be adjacent to pointer name to follow Linux coding style. Issue found with checkpatch.pl
ERROR: "foo * bar" should be "foo *bar"

You should put the full email address here. And it should be Acked-by.

This is a v2, so you should say that in the subject line and explain what you changed. Did Greg already take the others in the series?

julia

Quoted 29 lines
---
 drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +2 -3
index 243394e..28bfdbd 100644
@@ -528,8 +528,8 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param,
 	}
 
 	if (padapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) { /*  802_1x */
-		struct sta_info * psta,*pbcmc_sta;
-		struct sta_priv * pstapriv = &padapter->stapriv;
+		struct sta_info *psta, *pbcmc_sta;
+		struct sta_priv *pstapriv = &padapter->stapriv;
 
 		if (check_fwstate(pmlmepriv, WIFI_STATION_STATE | WIFI_MP_STATE) == true) { /* sta mode */
 			psta = rtw_get_stainfo(pstapriv, get_bssid(pmlmepriv));
--

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/deb7888572fb02d8cbd80fcaf9d9cef69c550d88.1539278377.git.mamtashukla555%40gmail.com.
For more options, visit https://groups.google.com/d/optout.

#6 lore raw

Re: [Outreachy kernel] [PATCH 3/3] staging: rtl8723bs: os_dep: Shift * to be adjacent to pointer name

Quoted 11 lines · Julia Lawall
Quoted 10 lines · Mamta Shukla

Shift * to be adjacent to pointer name to follow Linux coding style.
Issue found with checkpatch.pl
ERROR: "foo * bar" should be "foo *bar"

Quoted 8 lines
Quoted 6 lines

You should put the full email address here. And it should be Acked-by.

This is a v2, so you should say that in the subject line and explain what you changed. Did Greg already take the others in the series?

julia

This was the issue with this patch:

This patch is somehow corrupted. Can you fix it up and resend it, keeping Larry's ack?

Quoted 3 lines

thanks,

greg k-h

Yes, Greg had already taken the others in the series. I did this patch again to fix it.
This patch had got corrupted previously.
I will add the revision and change log.

Quoted 39 lines

Review

Quoted 5 lines
---
 drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
(quoted diff) +0 -0

b/drivers/staging/rtl8723bs/os_dep/ioctl_linux.c

drivers/staging/rtl8723bs/os_dep/ioctl_linux.c static int wpa_set_encryption(struct net_device

Quoted 4 lines

index 243394e..28bfdbd 100644

drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +0 -0
@@ -528,8 +528,8 @@ static int wpa_set_encryption(struct net_device

*dev, struct ieee_param *param,

drivers/staging/rtl8723bs/os_dep/ioctl_linux.c static int wpa_set_encryption(struct net_device · line 530

Quoted 3 lines
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +0 -0
      }
 
      if (padapter->securitypriv.dot11AuthAlgrthm ==

dot11AuthAlgrthm_8021X) { /* 802_1x */

drivers/staging/rtl8723bs/os_dep/ioctl_linux.c static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param,

Quoted 6 lines
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +2 -2
-             struct sta_info * psta,*pbcmc_sta;
-             struct sta_priv * pstapriv = &padapter->stapriv;
+             struct sta_info *psta, *pbcmc_sta;
+             struct sta_priv *pstapriv = &padapter->stapriv;
 
              if (check_fwstate(pmlmepriv, WIFI_STATION_STATE |

WIFI_MP_STATE) == true) { /* sta mode */

drivers/staging/rtl8723bs/os_dep/ioctl_linux.c static int wpa_set_encryption(struct net_device · line 535

Quoted 1 line
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +0 -0
                      psta = rtw_get_stainfo(pstapriv,

get_bssid(pmlmepriv));

Quoted 5 lines

--
1.9.1

--
You received this message because you are subscribed to the Google

Groups "outreachy-kernel" group.

Quoted 1 line

To unsubscribe from this group and stop receiving emails from it, send

an email to [email protected].

Quoted 2 lines

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/deb7888572fb02d8cbd80fcaf9d9cef69c550d88.1539278377.git.mamtashukla555%40gmail.com
.

Quoted 2 lines

For more options, visit https://groups.google.com/d/optout.

Signature · 5 lines
Mamta Shukla
Pune Institute  of Computer Technology
Pune
m: 9158516957
e : [email protected]
Acked-by on the v1 series
#7 lore raw
In reply to Mamta Shukla
Quoted 6 lines · Mamta Shukla

This patch series fixes checkpatch issues such as:

(quoted diff) +0 -3
-Remove true and false comparison
-Remove space after cast
-Shift * to be adjacent to pointer name to conform kernel coding style.
Quoted 7 lines

Mamta Shukla (3):
staging: rtl8723bs: os_dep: Remove true and false comparison
staging: rtl8723bs: os_dep: Remove space after cast
staging: rtl8723bs: os_dep: Shift * to be adjacent to pointer name

  drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 30 +++++++++++++-------------
  1 file changed, 15 insertions(+), 15 deletions(-)

That is for all 3.

Larry

#8 lore raw
In reply to Mamta Shukla

Review

Quoted 4 lines · Mamta Shukla

This patch series fixes checkpatch issues such as:

(quoted diff) +0 -3
-Remove true and false comparison
-Remove space after cast
-Shift * to be adjacent to pointer name to conform kernel coding style.

Good jobs in cleaning these up, since the original code doesn't look very nice at all :)

julia

Quoted 20 lines

Mamta Shukla (3):
staging: rtl8723bs: os_dep: Remove true and false comparison
staging: rtl8723bs: os_dep: Remove space after cast
staging: rtl8723bs: os_dep: Shift * to be adjacent to pointer name

 drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 30 +++++++++++++-------------
 1 file changed, 15 insertions(+), 15 deletions(-)

--
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/cover.1539278377.git.mamtashukla555%40gmail.com.
For more options, visit https://groups.google.com/d/optout.