[PATCH 1/4] mtd: spi-nor: Return early in the non-RWW lock paths
From: Miquel Raynal
Date: Thu Nov 19 2026 - 17:14:26 EST
Return early from the non-RWW path so the RWW branch can later grow.
No functional change.
Signed-off-by: Miquel Raynal <miquel.raynal@xxxxxxxxxxx>
---
drivers/mtd/spi-nor/core.c | 30 ++++++++++++++++++------------
1 file changed, 18 insertions(+), 12 deletions(-)
diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c
index a04d22d2e2e1..fdd6ff1e0aba 100644
--- a/drivers/mtd/spi-nor/core.c
+++ b/drivers/mtd/spi-nor/core.c
@@ -1224,11 +1224,13 @@ int spi_nor_prep_and_lock(struct spi_nor *nor)
if (ret)
return ret;
- if (!spi_nor_use_parallel_locking(nor))
+ if (!spi_nor_use_parallel_locking(nor)) {
mutex_lock(&nor->lock);
- else
- ret = wait_event_killable(nor->rww.wait,
- spi_nor_rww_start_exclusive(nor));
+ return 0;
+ }
+
+ ret = wait_event_killable(nor->rww.wait,
+ spi_nor_rww_start_exclusive(nor));
if (ret)
spi_nor_unprep(nor);
@@ -1298,11 +1300,13 @@ static int spi_nor_prep_and_lock_pe(struct spi_nor *nor, loff_t start, size_t le
if (ret)
return ret;
- if (!spi_nor_use_parallel_locking(nor))
+ if (!spi_nor_use_parallel_locking(nor)) {
mutex_lock(&nor->lock);
- else
- ret = wait_event_killable(nor->rww.wait,
- spi_nor_rww_start_pe(nor, start, len));
+ return 0;
+ }
+
+ ret = wait_event_killable(nor->rww.wait,
+ spi_nor_rww_start_pe(nor, start, len));
if (ret)
spi_nor_unprep(nor);
@@ -1374,11 +1378,13 @@ static int spi_nor_prep_and_lock_rd(struct spi_nor *nor, loff_t start, size_t le
if (ret)
return ret;
- if (!spi_nor_use_parallel_locking(nor))
+ if (!spi_nor_use_parallel_locking(nor)) {
mutex_lock(&nor->lock);
- else
- ret = wait_event_killable(nor->rww.wait,
- spi_nor_rww_start_rd(nor, start, len));
+ return 0;
+ }
+
+ ret = wait_event_killable(nor->rww.wait,
+ spi_nor_rww_start_rd(nor, start, len));
if (ret)
spi_nor_unprep(nor);
--
2.56.0