diff mbox series

sb1000: fix a couple of indentation issues

Message ID 20190117001301.29948-1-colin.king@canonical.com
State Superseded
Delegated to: David Miller
Headers show
Series sb1000: fix a couple of indentation issues | expand

Commit Message

Colin Ian King Jan. 17, 2019, 12:13 a.m. UTC 
From: Colin Ian King <colin.king@canonical.com>

There is an if statement and a return statement that are incorrectly
indented. Fix these.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 drivers/net/sb1000.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Joe Perches Jan. 17, 2019, 12:20 a.m. UTC | #1 
On Thu, 2019-01-17 at 00:13 +0000, 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.
[]
> diff --git a/drivers/net/sb1000.c b/drivers/net/sb1000.c
[]
> @@ -540,12 +540,12 @@ sb1000_activate(const int ioaddr[], const char* name)
>  	if ((status = card_send_command(ioaddr, name, Command1, st)))
>  		return status;
>  	if (st[3] != 0xf1) {
> -    	if ((status = sb1000_start_get_set_command(ioaddr, name)))
> +		if ((status = sb1000_start_get_set_command(ioaddr, name)))

Probably better to remove the assignment in the if at the same time.

		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 */
David Miller Jan. 18, 2019, 5:52 a.m. UTC | #2 
From: Colin King <colin.king@canonical.com>
Date: Thu, 17 Jan 2019 00:13:01 +0000

> From: Colin Ian King <colin.king@canonical.com>
> 
> There is an if statement and a return statement that are incorrectly
> indented. Fix these.
> 
> Signed-off-by: Colin Ian King <colin.king@canonical.com>

Applied to net-next.
diff mbox series

Patch

diff --git a/drivers/net/sb1000.c b/drivers/net/sb1000.c
index 7820fced33f6..af4838124f8c 100644
--- a/drivers/net/sb1000.c
+++ b/drivers/net/sb1000.c
@@ -540,12 +540,12 @@  sb1000_activate(const int ioaddr[], const char* name)
 	if ((status = card_send_command(ioaddr, name, Command1, st)))
 		return status;
 	if (st[3] != 0xf1) {
-    	if ((status = sb1000_start_get_set_command(ioaddr, name)))
+		if ((status = sb1000_start_get_set_command(ioaddr, name)))
 			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 */