linux-kernel - Re: [PATCH] fix a couple of indentation issues and remove assignment in if statements

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <91ca2065-a3d0-d163-6f28-8cdeb5c693b8@canonical.com>
Date:   Thu, 17 Jan 2019 00:34:25 +0000
From:   Colin Ian King <colin.king@...onical.com>
To:     "David S . Miller" <davem@...emloft.net>, netdev@...r.kernel.org
Cc:     kernel-janitors@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] fix a couple of indentation issues and remove assignment
 in if statements

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@...onical.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@...onical.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 */
>