From: Tudor Ambarus <tudor.ambarus@microchip.com>
To: <vigneshr@ti.com>, <michael@walle.cc>, <p.yadav@ti.com>
Cc: <miquel.raynal@bootlin.com>, <richard@nod.at>,
<linux-kernel@vger.kernel.org>, <linux-mtd@lists.infradead.org>,
"Tudor Ambarus" <tudor.ambarus@microchip.com>,
Joe Perches <joe@perches.com>
Subject: [PATCH v3 2/2] mtd: spi-nor: swp: Improve code around spi_nor_check_lock_status_sr()
Date: Mon, 22 Mar 2021 09:51:31 +0200 [thread overview]
Message-ID: <20210322075131.45093-3-tudor.ambarus@microchip.com> (raw)
In-Reply-To: <20210322075131.45093-1-tudor.ambarus@microchip.com>
- 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 <joe@perches.com>
Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
---
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
next prev parent reply other threads:[~2021-03-22 7:53 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-22 7:51 [PATCH v3 0/2] mtd: spi-nor: Cleanup patches Tudor Ambarus
2021-03-22 7:51 ` [PATCH v3 1/2] mtd: spi-nor: Move Software Write Protection logic out of the core Tudor Ambarus
2021-03-22 8:26 ` Pratyush Yadav
2021-03-22 9:12 ` Michael Walle
2021-03-22 7:51 ` Tudor Ambarus [this message]
2021-03-22 8:26 ` [PATCH v3 2/2] mtd: spi-nor: swp: Improve code around spi_nor_check_lock_status_sr() Pratyush Yadav
2021-03-22 8:57 ` Michael Walle
2021-04-02 6:38 ` [PATCH v3 0/2] mtd: spi-nor: Cleanup patches Tudor Ambarus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210322075131.45093-3-tudor.ambarus@microchip.com \
--to=tudor.ambarus@microchip.com \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=michael@walle.cc \
--cc=miquel.raynal@bootlin.com \
--cc=p.yadav@ti.com \
--cc=richard@nod.at \
--cc=vigneshr@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).