[PATCH] Staging: rtl8712: Fixed brace and comment style issue

[PATCH] Staging: rtl8712: Fixed brace and comment style issue

[Anuradha Weeraman]

Fixed issues with coding style.

Signed-off-by: Anuradha Weeraman <anuradha@weeraman.com>
---
 drivers/staging/rtl8712/xmit_linux.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/rtl8712/xmit_linux.c b/drivers/staging/rtl8712/xmit_linux.c
index 695f9b9..1e86133 100644
--- a/drivers/staging/rtl8712/xmit_linux.c
+++ b/drivers/staging/rtl8712/xmit_linux.c
@@ -91,7 +91,8 @@ void r8712_set_qos(struct pkt_file *ppktfile, struct pkt_attrib *pattrib)
 	} else {
 		/* "When priority processing of data frames is supported,
 		 * a STA's SME should send EAPOL-Key frames at the highest
-		 * priority." */
+		 * priority."
+		 */
 
 		if (pattrib->ether_type == 0x888e)
 			UserPriority = 7;
@@ -162,16 +163,16 @@ int r8712_xmit_entry(_pkt *pkt, struct  net_device *pnetdev)
 	struct _adapter *padapter = netdev_priv(pnetdev);
 	struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
 
-	if (!r8712_if_up(padapter)) {
+	if (!r8712_if_up(padapter))
 		goto _xmit_entry_drop;
-	}
+
 	pxmitframe = r8712_alloc_xmitframe(pxmitpriv);
-	if (!pxmitframe) {
+	if (!pxmitframe)
 		goto _xmit_entry_drop;
-	}
-	if ((!r8712_update_attrib(padapter, pkt, &pxmitframe->attrib))) {
+
+	if ((!r8712_update_attrib(padapter, pkt, &pxmitframe->attrib)))
 		goto _xmit_entry_drop;
-	}
+
 	padapter->ledpriv.LedControlHandler(padapter, LED_CTL_TX);
 	pxmitframe->pkt = pkt;
 	if (r8712_pre_xmit(padapter, pxmitframe)) {
-- 
2.9.0

Re: [PATCH] Staging: rtl8712: Fixed brace and comment style issue

[Luis de Bethencourt]

On 03/07/16 04:54, Anuradha Weeraman wrote:
> Fixed issues with coding style.
> 
> Signed-off-by: Anuradha Weeraman <anuradha@weeraman.com>
> ---
>  drivers/staging/rtl8712/xmit_linux.c | 15 ++++++++-------
>  1 file changed, 8 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/staging/rtl8712/xmit_linux.c b/drivers/staging/rtl8712/xmit_linux.c
> index 695f9b9..1e86133 100644
> --- a/drivers/staging/rtl8712/xmit_linux.c
> +++ b/drivers/staging/rtl8712/xmit_linux.c
> @@ -91,7 +91,8 @@ void r8712_set_qos(struct pkt_file *ppktfile, struct pkt_attrib *pattrib)
>  	} else {
>  		/* "When priority processing of data frames is supported,
>  		 * a STA's SME should send EAPOL-Key frames at the highest
> -		 * priority." */
> +		 * priority."
> +		 */
>  
>  		if (pattrib->ether_type == 0x888e)
>  			UserPriority = 7;
> @@ -162,16 +163,16 @@ int r8712_xmit_entry(_pkt *pkt, struct  net_device *pnetdev)
>  	struct _adapter *padapter = netdev_priv(pnetdev);
>  	struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
>  
> -	if (!r8712_if_up(padapter)) {
> +	if (!r8712_if_up(padapter))
>  		goto _xmit_entry_drop;
> -	}
> +
>  	pxmitframe = r8712_alloc_xmitframe(pxmitpriv);
> -	if (!pxmitframe) {
> +	if (!pxmitframe)
>  		goto _xmit_entry_drop;
> -	}
> -	if ((!r8712_update_attrib(padapter, pkt, &pxmitframe->attrib))) {
> +
> +	if ((!r8712_update_attrib(padapter, pkt, &pxmitframe->attrib)))
>  		goto _xmit_entry_drop;
> -	}
> +
>  	padapter->ledpriv.LedControlHandler(padapter, LED_CTL_TX);
>  	pxmitframe->pkt = pkt;
>  	if (r8712_pre_xmit(padapter, pxmitframe)) {
> 

Patch applies cleanly and removes the checkpatch issues related to
unnecessary braces and trailing */ in a different line.

Hi Anuradha,

It is a good idea to include the checkpatch issue you are solving in
the commit message, in this case it would be:

Fixed issues with coding style

WARNING: Block comments use a trailing */ on a separate line
#94: FILE: drivers/staging/rtl8712/xmit_linux.c:94:
+                * priority." */

WARNING: braces {} are not necessary for single statement blocks
#165: FILE: drivers/staging/rtl8712/xmit_linux.c:165:
+       if (!r8712_if_up(padapter)) {
+               goto _xmit_entry_drop;
+       }
---

You can send each type of checkpatch issue in an separate patch. If
you do this, please fix the other issues as well :) There are some
CamelCase problems and the GPL header needs fixing.

Thanks 
Luis

[PATCH] Staging: rtl8712: Fixed brace and comment style issue

[Anuradha Weeraman]

Fixed issues with coding style.

Signed-off-by: Anuradha Weeraman <anuradha@weeraman.com>
---
 drivers/staging/rtl8712/xmit_linux.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/rtl8712/xmit_linux.c b/drivers/staging/rtl8712/xmit_linux.c
index 695f9b9..1e86133 100644
--- a/drivers/staging/rtl8712/xmit_linux.c
+++ b/drivers/staging/rtl8712/xmit_linux.c
@@ -91,7 +91,8 @@ void r8712_set_qos(struct pkt_file *ppktfile, struct pkt_attrib *pattrib)
 	} else {
 		/* "When priority processing of data frames is supported,
 		 * a STA's SME should send EAPOL-Key frames at the highest
-		 * priority." */
+		 * priority."
+		 */
 
 		if (pattrib->ether_type == 0x888e)
 			UserPriority = 7;
@@ -162,16 +163,16 @@ int r8712_xmit_entry(_pkt *pkt, struct  net_device *pnetdev)
 	struct _adapter *padapter = netdev_priv(pnetdev);
 	struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
 
-	if (!r8712_if_up(padapter)) {
+	if (!r8712_if_up(padapter))
 		goto _xmit_entry_drop;
-	}
+
 	pxmitframe = r8712_alloc_xmitframe(pxmitpriv);
-	if (!pxmitframe) {
+	if (!pxmitframe)
 		goto _xmit_entry_drop;
-	}
-	if ((!r8712_update_attrib(padapter, pkt, &pxmitframe->attrib))) {
+
+	if ((!r8712_update_attrib(padapter, pkt, &pxmitframe->attrib)))
 		goto _xmit_entry_drop;
-	}
+
 	padapter->ledpriv.LedControlHandler(padapter, LED_CTL_TX);
 	pxmitframe->pkt = pkt;
 	if (r8712_pre_xmit(padapter, pxmitframe)) {
-- 
2.9.0