[PATCH] mtd: ubi: remove redundant check on bytes_left at end of function

[PATCH] mtd: ubi: remove redundant check on bytes_left at end of function

[Colin Ian King]

In function ubi_nvmem_reg_read the while-loop can only be exiting
of bytes_left is zero or an error has occurred. There is an exit
return path if an error occurs, so the bytes_left can only be
zero after that point. Hence the check for a non-zero bytes_left
at the end of the function is redundant and can be removed. Remove
the check and just return 0.

Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
---
 drivers/mtd/ubi/nvmem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/ubi/nvmem.c b/drivers/mtd/ubi/nvmem.c
index a94a1a9aaec1..34f8c1d3cdee 100644
--- a/drivers/mtd/ubi/nvmem.c
+++ b/drivers/mtd/ubi/nvmem.c
@@ -55,7 +55,7 @@ static int ubi_nvmem_reg_read(void *priv, unsigned int from,
 	if (err)
 		return err;
 
-	return bytes_left == 0 ? 0 : -EIO;
+	return 0;
 }
 
 static int ubi_nvmem_add(struct ubi_volume_info *vi)
-- 
2.39.5

Re: [PATCH] mtd: ubi: remove redundant check on bytes_left at end of function

[Zhihao Cheng]

在 2024/11/7 23:23, Colin Ian King 写道:
> In function ubi_nvmem_reg_read the while-loop can only be exiting
> of bytes_left is zero or an error has occurred. There is an exit
> return path if an error occurs, so the bytes_left can only be
> zero after that point. Hence the check for a non-zero bytes_left
> at the end of the function is redundant and can be removed. Remove
> the check and just return 0.
> 
> Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
> ---
>   drivers/mtd/ubi/nvmem.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
Make sense.
Reviewed-by: Zhihao Cheng <chengzhihao1@huawei.com>
> diff --git a/drivers/mtd/ubi/nvmem.c b/drivers/mtd/ubi/nvmem.c
> index a94a1a9aaec1..34f8c1d3cdee 100644
> --- a/drivers/mtd/ubi/nvmem.c
> +++ b/drivers/mtd/ubi/nvmem.c
> @@ -55,7 +55,7 @@ static int ubi_nvmem_reg_read(void *priv, unsigned int from,
>   	if (err)
>   		return err;
>   
> -	return bytes_left == 0 ? 0 : -EIO;
> +	return 0;
>   }
>   
>   static int ubi_nvmem_add(struct ubi_volume_info *vi)
>