From: Tudor Ambarus <tudor.ambarus@microchip.com>
To: <p.yadav@ti.com>, <michael@walle.cc>
Cc: <miquel.raynal@bootlin.com>, <richard@nod.at>, <vigneshr@ti.com>,
<linux-mtd@lists.infradead.org>, <linux-kernel@vger.kernel.org>,
<nicolas.ferre@microchip.com>,
Tudor Ambarus <tudor.ambarus@microchip.com>
Subject: [PATCH v3 3/9] mtd: spi-nor: core: Use auto-detection only once
Date: Mon, 11 Apr 2022 12:10:27 +0300 [thread overview]
Message-ID: <20220411091033.98754-4-tudor.ambarus@microchip.com> (raw)
In-Reply-To: <20220411091033.98754-1-tudor.ambarus@microchip.com>
In case spi_nor_match_name() returned NULL, the auto detection was
issued twice. There's no reason to try to detect the same chip twice,
do the auto detection only once.
Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
---
v3:
- caller of spi_nor_get_flash_info now handles NULL and translates it to
ENOENT.
drivers/mtd/spi-nor/core.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c
index b9cc8bbf1f62..b55d922d46dd 100644
--- a/drivers/mtd/spi-nor/core.c
+++ b/drivers/mtd/spi-nor/core.c
@@ -2896,13 +2896,14 @@ static const struct flash_info *spi_nor_get_flash_info(struct spi_nor *nor,
{
const struct flash_info *info = NULL;
- if (name)
+ if (name) {
info = spi_nor_match_name(nor, name);
+ if (IS_ERR(info))
+ return info;
+ }
/* Try to auto-detect if chip name wasn't specified or not found */
if (!info)
- info = spi_nor_read_id(nor);
- if (IS_ERR_OR_NULL(info))
- return ERR_PTR(-ENOENT);
+ return spi_nor_read_id(nor);
/*
* If caller has specified name of flash model that can normally be
@@ -2994,7 +2995,9 @@ int spi_nor_scan(struct spi_nor *nor, const char *name,
return -ENOMEM;
info = spi_nor_get_flash_info(nor, name);
- if (IS_ERR(info))
+ if (!info)
+ return -ENOENT;
+ else if (IS_ERR(info))
return PTR_ERR(info);
nor->info = info;
--
2.25.1
next prev parent reply other threads:[~2022-04-11 9:10 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-11 9:10 [PATCH v3 0/9] mtd: spi-nor: Rework Octal DTR methods Tudor Ambarus
2022-04-11 9:10 ` [PATCH v3 1/9] mtd: spi-nor: Rename method, s/spi_nor_match_id/spi_nor_match_name Tudor Ambarus
2022-04-11 9:10 ` [PATCH v3 2/9] mtd: spi-nor: Introduce spi_nor_match_id() Tudor Ambarus
2022-04-11 9:10 ` Tudor Ambarus [this message]
2022-04-19 10:18 ` [PATCH v3 3/9] mtd: spi-nor: core: Use auto-detection only once Michael Walle
2022-04-11 9:10 ` [PATCH v3 4/9] mtd: spi-nor: core: Introduce method for RDID op Tudor Ambarus
2022-04-19 11:10 ` Michael Walle
2022-04-11 9:10 ` [PATCH v3 5/9] mtd: spi-nor: manufacturers: Use spi_nor_read_id() core method Tudor Ambarus
2022-04-19 11:14 ` Michael Walle
2022-04-11 9:10 ` [PATCH v3 6/9] mtd: spi-nor: core: Add helpers to read/write any register Tudor Ambarus
2022-04-19 11:19 ` Michael Walle
2022-04-19 11:46 ` Michael Walle
2022-04-19 12:08 ` Tudor.Ambarus
2022-04-19 12:32 ` Pratyush Yadav
2022-04-19 12:46 ` Michael Walle
2022-04-19 12:56 ` Tudor.Ambarus
2022-04-20 4:34 ` Pratyush Yadav
2022-04-20 5:20 ` Takahiro Kuwano
2022-04-20 5:25 ` Tudor.Ambarus
2022-04-19 13:02 ` Tudor.Ambarus
2022-04-19 12:59 ` Tudor.Ambarus
2022-04-11 9:10 ` [PATCH v3 7/9] mtd: spi-nor: micron-st: Rework spi_nor_micron_octal_dtr_enable() Tudor Ambarus
2022-04-19 11:43 ` Michael Walle
2022-04-11 9:10 ` [PATCH v3 8/9] mtd: spi-nor: spansion: Rework spi_nor_cypress_octal_dtr_enable() Tudor Ambarus
2022-04-19 11:44 ` Michael Walle
2022-04-11 9:10 ` [PATCH v3 9/9] mtd: spi-nor: Introduce templates for SPI NOR operations Tudor Ambarus
2022-04-19 11:45 ` Michael Walle
2022-04-20 7:49 ` Pratyush Yadav
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=20220411091033.98754-4-tudor.ambarus@microchip.com \
--to=tudor.ambarus@microchip.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=michael@walle.cc \
--cc=miquel.raynal@bootlin.com \
--cc=nicolas.ferre@microchip.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).