2021-03-22 07:54:20

by Tudor Ambarus

Subject: [PATCH v3 2/2] mtd: spi-nor: swp: Improve code around spi_nor_check_lock_status_sr()

- bool return value for spi_nor_check_lock_status_sr(), gets rid of
the return 1,
- introduce temporary variables for better readability.

Suggested-by: Joe Perches <[email protected]>
Signed-off-by: Tudor Ambarus <[email protected]>
---
v3: new patch

drivers/mtd/spi-nor/swp.c | 27 +++++++++++++++------------
1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/drivers/mtd/spi-nor/swp.c b/drivers/mtd/spi-nor/swp.c
index 5b236db6bb56..8594bcbb7dbe 100644
--- a/drivers/mtd/spi-nor/swp.c
+++ b/drivers/mtd/spi-nor/swp.c
@@ -81,36 +81,39 @@ static void spi_nor_get_locked_range_sr(struct spi_nor *nor, u8 sr, loff_t *ofs,
}

/*
- * Return 1 if the entire region is locked (if @locked is true) or unlocked (if
- * @locked is false); 0 otherwise
+ * Return true if the entire region is locked (if @locked is true) or unlocked
+ * (if @locked is false); false otherwise.
*/
-static int spi_nor_check_lock_status_sr(struct spi_nor *nor, loff_t ofs,
- uint64_t len, u8 sr, bool locked)
+static bool spi_nor_check_lock_status_sr(struct spi_nor *nor, loff_t ofs,
+ uint64_t len, u8 sr, bool locked)
{
- loff_t lock_offs;
+ loff_t lock_offs, lock_offs_max, offs_max;
uint64_t lock_len;

if (!len)
- return 1;
+ return true;

spi_nor_get_locked_range_sr(nor, sr, &lock_offs, &lock_len);

+ lock_offs_max = lock_offs + lock_len;
+ offs_max = ofs + len;
+
if (locked)
/* Requested range is a sub-range of locked range */
- return (ofs + len <= lock_offs + lock_len) && (ofs >= lock_offs);
+ return (offs_max <= lock_offs_max) && (ofs >= lock_offs);
else
/* Requested range does not overlap with locked range */
- return (ofs >= lock_offs + lock_len) || (ofs + len <= lock_offs);
+ return (ofs >= lock_offs_max) || (offs_max <= lock_offs);
}

-static int spi_nor_is_locked_sr(struct spi_nor *nor, loff_t ofs, uint64_t len,
- u8 sr)
+static bool spi_nor_is_locked_sr(struct spi_nor *nor, loff_t ofs, uint64_t len,
+ u8 sr)
{
return spi_nor_check_lock_status_sr(nor, ofs, len, sr, true);
}

-static int spi_nor_is_unlocked_sr(struct spi_nor *nor, loff_t ofs, uint64_t len,
- u8 sr)
+static bool spi_nor_is_unlocked_sr(struct spi_nor *nor, loff_t ofs,
+ uint64_t len, u8 sr)
{
return spi_nor_check_lock_status_sr(nor, ofs, len, sr, false);
}
--
2.25.1

2021-03-22 08:28:32

by Pratyush Yadav

Subject: Re: [PATCH v3 2/2] mtd: spi-nor: swp: Improve code around spi_nor_check_lock_status_sr()

On 22/03/21 09:51AM, Tudor Ambarus wrote:
> - bool return value for spi_nor_check_lock_status_sr(), gets rid of
> the return 1,
> - introduce temporary variables for better readability.
>
> Suggested-by: Joe Perches <[email protected]>
> Signed-off-by: Tudor Ambarus <[email protected]>

Reviewed-by: Pratyush Yadav <[email protected]>

--
Regards,
Pratyush Yadav
Texas Instruments Inc.

2021-03-22 09:00:35

by Michael Walle

Subject: Re: [PATCH v3 2/2] mtd: spi-nor: swp: Improve code around spi_nor_check_lock_status_sr()

Am 2021-03-22 08:51, schrieb Tudor Ambarus:
> - bool return value for spi_nor_check_lock_status_sr(), gets rid of
> the return 1,
> - introduce temporary variables for better readability.
>
> Suggested-by: Joe Perches <[email protected]>
> Signed-off-by: Tudor Ambarus <[email protected]>
> ---

Reviewed-by: Michael Walle <[email protected]>

-michael