summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorMichael Walle <mwalle@kernel.org>2026-07-13 11:11:41 +0200
committerMichael Walle <mwalle@kernel.org>2026-09-04 10:29:48 +0200
commite37ee8734881a7f92dbbeecf8cc129dd8a6a76b8 (patch)
treed8a4cc58f23b2a78614e2e4c88672bf4bbc4dec3 /include/linux
parenta4cd8da7f2bda7562a7e156ee9c9e9b3ba98208e (diff)
downloadlinux-next-e37ee8734881a7f92dbbeecf8cc129dd8a6a76b8.tar.gz
linux-next-e37ee8734881a7f92dbbeecf8cc129dd8a6a76b8.zip
mtd: spi-nor: move cmd_ext_type into spi_nor_flash_parameter
Right now the SFDP parsing code is modifying both members of struct spi_nor_flash_parameter and struct spi_nor. This may lead to inconsistencies if the parsing fails because only the flash parameters are rolled back. To fix this, move cmd_ext_type into the struct spi_nor_flash_parameter. Reported-by: Sashiko <sashiko-bot@kernel.org> Closes: https://sashiko.dev/#/patchset/20260601125438.3481722-1-mwalle%40kernel.org?part=3 Signed-off-by: Michael Walle <mwalle@kernel.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/mtd/spi-nor.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/mtd/spi-nor.h b/include/linux/mtd/spi-nor.h
index 4b92494827b1..e75c1b4cb4c0 100644
--- a/include/linux/mtd/spi-nor.h
+++ b/include/linux/mtd/spi-nor.h
@@ -366,7 +366,6 @@ struct spi_nor_flash_parameter;
* @program_opcode: the program opcode
* @sst_write_second: used by the SST write operation
* @flags: flag options for the current SPI NOR (SNOR_F_*)
- * @cmd_ext_type: the command opcode extension type for DTR mode.
* @read_proto: the SPI protocol for read operations
* @write_proto: the SPI protocol for write operations
* @reg_proto: the SPI protocol for read_reg/write_reg/erase operations
@@ -408,7 +407,6 @@ struct spi_nor {
enum spi_nor_protocol reg_proto;
bool sst_write_second;
u32 flags;
- enum spi_nor_cmd_ext cmd_ext_type;
struct sfdp *sfdp;
struct dentry *debugfs_root;
u8 dfs_sr_cache[2];