[mtd-next] mtd: spi-nor: remove redundant check on err

Message ID 20170629175054.12231-1-colin.king@canonical.com
State Rejected
Delegated to: Cyrille Pitchen
Headers show

Commit Message

Colin Ian King June 29, 2017, 5:50 p.m.
From: Colin Ian King <colin.king@canonical.com>

The variable err is not updated since the previous check on it, so
the subsequent check on err is redundant and can be removed.

Detected by CoverityScan, CID#1448658 ("Logically dead code")

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 drivers/mtd/spi-nor/spi-nor.c | 3 ---
 1 file changed, 3 deletions(-)

Comments

Cyrille Pitchen Aug. 1, 2017, 4:33 p.m. | #1
Hi Colin,

Le 29/06/2017 à 19:50, Colin King a écrit :
> From: Colin Ian King <colin.king@canonical.com>
> 
> The variable err is not updated since the previous check on it, so
> the subsequent check on err is redundant and can be removed.
> 
> Detected by CoverityScan, CID#1448658 ("Logically dead code")
> 
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  drivers/mtd/spi-nor/spi-nor.c | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
> index 196b52f083ae..1296c1931591 100644
> --- a/drivers/mtd/spi-nor/spi-nor.c
> +++ b/drivers/mtd/spi-nor/spi-nor.c
> @@ -2307,9 +2307,6 @@ static int spi_nor_parse_sfdp(struct spi_nor *nor,
>  		default:
>  			break;
>  		}
> -
> -		if (err)
> -			goto exit;

Sorry but this was done on purpose to prepare the structure of the
source code so it's more easy to add later parsing of optional SFDP
tables such as the 4-byte address instruction set table or sector erase
map table.
At that time each case of the switch statement should update the value
of 'err'.

Best regards,

Cyrille
>  	}
>  
>  exit:
>
walter harms Aug. 1, 2017, 5 p.m. | #2
Am 01.08.2017 18:33, schrieb Cyrille Pitchen:
> Hi Colin,
> 
> Le 29/06/2017 à 19:50, Colin King a écrit :
>> From: Colin Ian King <colin.king@canonical.com>
>>
>> The variable err is not updated since the previous check on it, so
>> the subsequent check on err is redundant and can be removed.
>>
>> Detected by CoverityScan, CID#1448658 ("Logically dead code")
>>
>> Signed-off-by: Colin Ian King <colin.king@canonical.com>
>> ---
>>  drivers/mtd/spi-nor/spi-nor.c | 3 ---
>>  1 file changed, 3 deletions(-)
>>
>> diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
>> index 196b52f083ae..1296c1931591 100644
>> --- a/drivers/mtd/spi-nor/spi-nor.c
>> +++ b/drivers/mtd/spi-nor/spi-nor.c
>> @@ -2307,9 +2307,6 @@ static int spi_nor_parse_sfdp(struct spi_nor *nor,
>>  		default:
>>  			break;
>>  		}
>> -
>> -		if (err)
>> -			goto exit;
> 
> Sorry but this was done on purpose to prepare the structure of the
> source code so it's more easy to add later parsing of optional SFDP
> tables such as the 4-byte address instruction set table or sector erase
> map table.
> At that time each case of the switch statement should update the value
> of 'err'.
> 
> Best regards,
> 

This is hard to guess, could you add a comment so the next well meaning person
has a chance to know that this is onn purpose ?

re,
 wh


> Cyrille
>>  	}
>>  
>>  exit:
>>
> 
> --
> To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>

Patch

diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
index 196b52f083ae..1296c1931591 100644
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -2307,9 +2307,6 @@  static int spi_nor_parse_sfdp(struct spi_nor *nor,
 		default:
 			break;
 		}
-
-		if (err)
-			goto exit;
 	}
 
 exit: