Re: [PATCH v2] drivers: staging: rtl8712: remove unnecessary else statement

[Dan Carpenter <dan.carpenter@oracle.com>]

On Mon, Jun 22, 2015 at 04:58:41PM +0530, Sunil Shahu wrote:
> "else" statement after "if" is unnecessary, hence removed.
> 
> Signed-off-by: Sunil Shahu <shshahu@gmail.com>
> ---
>  drivers/staging/rtl8712/rtl871x_security.c | 35 ++++++++++++++----------------
>  1 file changed, 16 insertions(+), 19 deletions(-)
> 
> diff --git a/drivers/staging/rtl8712/rtl871x_security.c b/drivers/staging/rtl8712/rtl871x_security.c
> index bcd1a51..21465c9 100644
> --- a/drivers/staging/rtl8712/rtl871x_security.c
> +++ b/drivers/staging/rtl8712/rtl871x_security.c
> @@ -124,28 +124,25 @@ static u8 crc32_reverseBit(u8 data)
>  
>  static void crc32_init(void)
>  {
> +	sint i, j;
> +	u32 c = 0x12340000;
                ^^^^^^^^^^
In another follow on patch you can get rid of this.  It is nonsense and
it isn't used.


> +	u8 *p = (u8 *)&c, *p1;
> +	u8 k;
> +
>  	if (bcrc32initialized == 1)
>  		return;
> -	else {
> -		sint i, j;
> -		u32 c;
> -		u8 *p = (u8 *)&c, *p1;
> -		u8 k;
> -
> -		c = 0x12340000;
> -		for (i = 0; i < 256; ++i) {
> -			k = crc32_reverseBit((u8)i);
> -			for (c = ((u32)k) << 24, j = 8; j > 0; --j)
> -				c = c & 0x80000000 ? (c << 1) ^ CRC32_POLY :
> -				    (c << 1);
> -			p1 = (u8 *)&crc32_table[i];
> -			p1[0] = crc32_reverseBit(p[3]);
> -			p1[1] = crc32_reverseBit(p[2]);
> -			p1[2] = crc32_reverseBit(p[1]);
> -			p1[3] = crc32_reverseBit(p[0]);
> -		}
> -		bcrc32initialized = 1;
> +
> +	for (i = 0; i < 256; ++i) {
> +		k = crc32_reverseBit((u8)i);
> +		for (c = ((u32)k) << 24, j = 8; j > 0; --j)
                     ^^^^^^^^^^^^^^^^^^
We always re-initialize c here.

> +			c = c & 0x80000000 ? (c << 1) ^ CRC32_POLY : (c << 1);
> +		p1 = (u8 *)&crc32_table[i];
> +		p1[0] = crc32_reverseBit(p[3]);
> +		p1[1] = crc32_reverseBit(p[2]);
> +		p1[2] = crc32_reverseBit(p[1]);
> +		p1[3] = crc32_reverseBit(p[0]);
>  	}
> +	bcrc32initialized = 1;
>  }

regards,
dan carpenter

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
Please read the FAQ at  http://www.tux.org/lkml/