From: Michael Walle <mwalle@kernel.org>
To: Pratyush Yadav <pratyush@kernel.org>,
Michael Walle <mwalle@kernel.org>,
Takahiro Kuwano <takahiro.kuwano@infineon.com>,
Miquel Raynal <miquel.raynal@bootlin.com>,
Richard Weinberger <richard@nod.at>,
Vignesh Raghavendra <vigneshr@ti.com>,
Tudor Ambarus <tudor.ambarus@linaro.org>
Cc: linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [RFC PATCH 2/3] mtd: spi-nor: don't clear the SNOR_F_4B_OPCODES flag on failure
Date: Mon, 1 Jun 2026 14:52:44 +0200 [thread overview]
Message-ID: <20260601125438.3481722-3-mwalle@kernel.org> (raw)
In-Reply-To: <20260601125438.3481722-1-mwalle@kernel.org>
This was introduced in commit 548ed6847f530 ("mtd: spi-nor: Add the
SNOR_F_4B_OPCODES flag"). It looks like it was the rollback mechanism if
parsing the SFDP failed, but was setting that flag first. Nowadays, that
flag can only be set if spi_nor_parse_4bait() was successful. IOW, the
flags won't be left in an undefined state if parsing SFDP fails.
Remove the unneeded code to be able to rework spi_nor_init_params().
Signed-off-by: Michael Walle <mwalle@kernel.org>
---
drivers/mtd/spi-nor/core.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c
index 4046e137531f..fbf8c2d9c6b5 100644
--- a/drivers/mtd/spi-nor/core.c
+++ b/drivers/mtd/spi-nor/core.c
@@ -3066,10 +3066,8 @@ static void spi_nor_sfdp_init_params_deprecated(struct spi_nor *nor)
memcpy(&sfdp_params, nor->params, sizeof(sfdp_params));
- if (spi_nor_parse_sfdp(nor)) {
+ if (spi_nor_parse_sfdp(nor))
memcpy(nor->params, &sfdp_params, sizeof(*nor->params));
- nor->flags &= ~SNOR_F_4B_OPCODES;
- }
}
/**
--
2.47.3
next prev parent reply other threads:[~2026-06-01 12:54 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-01 12:52 [RFC PATCH 0/3] mtd: spi-nor: Rework flash parameter initialization Michael Walle
2026-06-01 12:52 ` [RFC PATCH 1/3] mtd: spi-nor: spansion: s25fl256s0: remove SKIP_SFDP flag Michael Walle
2026-06-02 9:57 ` Miquel Raynal
2026-06-02 11:01 ` Michael Walle
2026-06-05 8:05 ` Takahiro.Kuwano
2026-06-05 13:05 ` Tudor Ambarus
2026-06-01 12:52 ` Michael Walle [this message]
2026-06-02 9:58 ` [RFC PATCH 2/3] mtd: spi-nor: don't clear the SNOR_F_4B_OPCODES flag on failure Miquel Raynal
2026-06-05 8:15 ` Takahiro.Kuwano
2026-06-05 13:05 ` Tudor Ambarus
2026-06-01 12:52 ` [RFC PATCH 3/3] mtd: spi-nor: rework flash parameter initialization Michael Walle
2026-06-05 13:17 ` Tudor Ambarus
2026-06-02 10:03 ` [RFC PATCH 0/3] mtd: spi-nor: Rework " Miquel Raynal
2026-06-03 0:13 ` Takahiro.Kuwano
2026-06-05 8:50 ` Takahiro.Kuwano
2026-07-02 2:39 ` Cheng Ming Lin
2026-07-02 15:17 ` Miquel Raynal
2026-07-07 6:35 ` Michael Walle
2026-07-06 6:24 ` Miquel Raynal
2026-07-06 7:33 ` Michael Walle
2026-07-06 13:45 ` Miquel Raynal
2026-07-06 14:16 ` Miquel Raynal
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=20260601125438.3481722-3-mwalle@kernel.org \
--to=mwalle@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=miquel.raynal@bootlin.com \
--cc=pratyush@kernel.org \
--cc=richard@nod.at \
--cc=takahiro.kuwano@infineon.com \
--cc=tudor.ambarus@linaro.org \
--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
Powered by JetHome