mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] fix a couple of indentation issues and remove assignment in if statements
@ 2019-01-17  0:33 Colin King
  2019-01-17  0:34 ` Colin Ian King
  0 siblings, 1 reply; 2+ messages in thread
From: Colin King @ 2019-01-17  0:33 UTC (permalink / raw)
  To: David S . Miller, netdev; +Cc: kernel-janitors, linux-kernel

From: Colin Ian King <colin.king@canonical.com>

There is an if statement and a return statement that are incorrectly
indented. Fix these.  Also replace the assignment-in-if statements
to assignment followed by an if to keep to the coding style.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---

V2: also clean up the assignment-in-if statements too

---

 drivers/net/sb1000.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/net/sb1000.c b/drivers/net/sb1000.c
index 7820fced33f6..941cfa8f1c2a 100644
--- a/drivers/net/sb1000.c
+++ b/drivers/net/sb1000.c
@@ -535,17 +535,20 @@ sb1000_activate(const int ioaddr[], const char* name)
 	int status;
 
 	ssleep(1);
-	if ((status = card_send_command(ioaddr, name, Command0, st)))
+	status = card_send_command(ioaddr, name, Command0, st);
+	if (status)
 		return status;
-	if ((status = card_send_command(ioaddr, name, Command1, st)))
+	status = card_send_command(ioaddr, name, Command1, st);
+	if (status)
 		return status;
 	if (st[3] != 0xf1) {
-    	if ((status = sb1000_start_get_set_command(ioaddr, name)))
+		status = sb1000_start_get_set_command(ioaddr, name);
+		if (status)
 			return status;
 		return -EIO;
 	}
 	udelay(1000);
-    return sb1000_start_get_set_command(ioaddr, name);
+	return sb1000_start_get_set_command(ioaddr, name);
 }
 
 /* get SB1000 firmware version */
-- 
2.19.1


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] fix a couple of indentation issues and remove assignment in if statements
  2019-01-17  0:33 [PATCH] fix a couple of indentation issues and remove assignment in if statements Colin King
@ 2019-01-17  0:34 ` Colin Ian King
  0 siblings, 0 replies; 2+ messages in thread
From: Colin Ian King @ 2019-01-17  0:34 UTC (permalink / raw)
  To: David S . Miller, netdev; +Cc: kernel-janitors, linux-kernel

Bah, forgot to fix up the subject line properly. V3. Coming.

On 17/01/2019 00:33, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> There is an if statement and a return statement that are incorrectly
> indented. Fix these.  Also replace the assignment-in-if statements
> to assignment followed by an if to keep to the coding style.
> 
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
> 
> V2: also clean up the assignment-in-if statements too
> 
> ---
> 
>  drivers/net/sb1000.c | 11 +++++++----
>  1 file changed, 7 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/net/sb1000.c b/drivers/net/sb1000.c
> index 7820fced33f6..941cfa8f1c2a 100644
> --- a/drivers/net/sb1000.c
> +++ b/drivers/net/sb1000.c
> @@ -535,17 +535,20 @@ sb1000_activate(const int ioaddr[], const char* name)
>  	int status;
>  
>  	ssleep(1);
> -	if ((status = card_send_command(ioaddr, name, Command0, st)))
> +	status = card_send_command(ioaddr, name, Command0, st);
> +	if (status)
>  		return status;
> -	if ((status = card_send_command(ioaddr, name, Command1, st)))
> +	status = card_send_command(ioaddr, name, Command1, st);
> +	if (status)
>  		return status;
>  	if (st[3] != 0xf1) {
> -    	if ((status = sb1000_start_get_set_command(ioaddr, name)))
> +		status = sb1000_start_get_set_command(ioaddr, name);
> +		if (status)
>  			return status;
>  		return -EIO;
>  	}
>  	udelay(1000);
> -    return sb1000_start_get_set_command(ioaddr, name);
> +	return sb1000_start_get_set_command(ioaddr, name);
>  }
>  
>  /* get SB1000 firmware version */
> 



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-01-17  0:34 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-17  0:33 [PATCH] fix a couple of indentation issues and remove assignment in if statements Colin King
2019-01-17  0:34 ` Colin Ian King

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®