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 v2 3/8] mtd: spi-nor: core: Use auto-detection only once Date: Mon, 28 Feb 2022 13:17:07 +0200 [thread overview] Message-ID: <20220228111712.111737-4-tudor.ambarus@microchip.com> (raw) In-Reply-To: <20220228111712.111737-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> --- drivers/mtd/spi-nor/core.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c index f87cb7d3daab..b1d6fa65417d 100644 --- a/drivers/mtd/spi-nor/core.c +++ b/drivers/mtd/spi-nor/core.c @@ -2894,13 +2894,15 @@ static const struct flash_info *spi_nor_match_name(struct spi_nor *nor, static const struct flash_info *spi_nor_get_flash_info(struct spi_nor *nor, const char *name) { - const struct flash_info *info = NULL; + const struct flash_info *info = NULL, *detected_info = NULL; if (name) info = spi_nor_match_name(nor, name); /* Try to auto-detect if chip name wasn't specified or not found */ - if (!info) - info = spi_nor_read_id(nor); + if (!info) { + detected_info = spi_nor_read_id(nor); + info = detected_info; + } if (IS_ERR_OR_NULL(info)) return ERR_PTR(-ENOENT); @@ -2908,7 +2910,7 @@ static const struct flash_info *spi_nor_get_flash_info(struct spi_nor *nor, * If caller has specified name of flash model that can normally be * detected using JEDEC, let's verify it. */ - if (name && info->id_len) { + if (name && !detected_info && info->id_len) { const struct flash_info *jinfo; jinfo = spi_nor_read_id(nor); -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
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 v2 3/8] mtd: spi-nor: core: Use auto-detection only once Date: Mon, 28 Feb 2022 13:17:07 +0200 [thread overview] Message-ID: <20220228111712.111737-4-tudor.ambarus@microchip.com> (raw) In-Reply-To: <20220228111712.111737-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> --- drivers/mtd/spi-nor/core.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c index f87cb7d3daab..b1d6fa65417d 100644 --- a/drivers/mtd/spi-nor/core.c +++ b/drivers/mtd/spi-nor/core.c @@ -2894,13 +2894,15 @@ static const struct flash_info *spi_nor_match_name(struct spi_nor *nor, static const struct flash_info *spi_nor_get_flash_info(struct spi_nor *nor, const char *name) { - const struct flash_info *info = NULL; + const struct flash_info *info = NULL, *detected_info = NULL; if (name) info = spi_nor_match_name(nor, name); /* Try to auto-detect if chip name wasn't specified or not found */ - if (!info) - info = spi_nor_read_id(nor); + if (!info) { + detected_info = spi_nor_read_id(nor); + info = detected_info; + } if (IS_ERR_OR_NULL(info)) return ERR_PTR(-ENOENT); @@ -2908,7 +2910,7 @@ static const struct flash_info *spi_nor_get_flash_info(struct spi_nor *nor, * If caller has specified name of flash model that can normally be * detected using JEDEC, let's verify it. */ - if (name && info->id_len) { + if (name && !detected_info && info->id_len) { const struct flash_info *jinfo; jinfo = spi_nor_read_id(nor); -- 2.25.1 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2022-02-28 11:17 UTC|newest] Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-02-28 11:17 [PATCH v2 0/8] mtd: spi-nor: Rework Octal DTR methods Tudor Ambarus 2022-02-28 11:17 ` Tudor Ambarus 2022-02-28 11:17 ` [PATCH v2 1/8] mtd: spi-nor: Rename method, s/spi_nor_match_id/spi_nor_match_name Tudor Ambarus 2022-02-28 11:17 ` Tudor Ambarus 2022-03-21 11:57 ` Pratyush Yadav 2022-03-21 11:57 ` Pratyush Yadav 2022-03-21 22:14 ` Michael Walle 2022-03-21 22:14 ` Michael Walle 2022-02-28 11:17 ` [PATCH v2 2/8] mtd: spi-nor: Introduce spi_nor_match_id() Tudor Ambarus 2022-02-28 11:17 ` Tudor Ambarus 2022-03-21 12:00 ` Pratyush Yadav 2022-03-21 12:00 ` Pratyush Yadav 2022-03-21 22:15 ` Michael Walle 2022-03-21 22:15 ` Michael Walle 2022-02-28 11:17 ` Tudor Ambarus [this message] 2022-02-28 11:17 ` [PATCH v2 3/8] mtd: spi-nor: core: Use auto-detection only once Tudor Ambarus 2022-03-21 12:14 ` Pratyush Yadav 2022-03-21 12:14 ` Pratyush Yadav 2022-03-21 12:50 ` Tudor.Ambarus 2022-03-21 12:50 ` Tudor.Ambarus 2022-03-21 17:42 ` Pratyush Yadav 2022-03-21 17:42 ` Pratyush Yadav 2022-03-21 22:38 ` Michael Walle 2022-03-21 22:38 ` Michael Walle 2022-03-30 18:50 ` Pratyush Yadav 2022-03-30 18:50 ` Pratyush Yadav 2022-02-28 11:17 ` [PATCH v2 4/8] mtd: spi-nor: core: Introduce method for RDID op Tudor Ambarus 2022-02-28 11:17 ` Tudor Ambarus 2022-03-21 12:21 ` Pratyush Yadav 2022-03-21 12:21 ` Pratyush Yadav 2022-03-21 13:18 ` Tudor.Ambarus 2022-03-21 13:18 ` Tudor.Ambarus 2022-03-21 17:39 ` Pratyush Yadav 2022-03-21 17:39 ` Pratyush Yadav 2022-03-30 6:53 ` Tudor.Ambarus 2022-03-30 6:53 ` Tudor.Ambarus 2022-03-30 18:49 ` Pratyush Yadav 2022-03-30 18:49 ` Pratyush Yadav 2022-03-21 22:56 ` Michael Walle 2022-03-21 22:56 ` Michael Walle 2022-03-22 7:32 ` Pratyush Yadav 2022-03-22 7:32 ` Pratyush Yadav 2022-03-22 8:19 ` Michael Walle 2022-03-22 8:19 ` Michael Walle 2022-02-28 11:17 ` [PATCH v2 5/8] mtd: spi-nor: manufacturers: Use spi_nor_read_id() core method Tudor Ambarus 2022-02-28 11:17 ` Tudor Ambarus 2022-03-21 12:27 ` Pratyush Yadav 2022-03-21 12:27 ` Pratyush Yadav 2022-02-28 11:17 ` [PATCH v2 6/8] mtd: spi-nor: core: Add helpers to read/write any register Tudor Ambarus 2022-02-28 11:17 ` Tudor Ambarus 2022-03-21 23:13 ` Michael Walle 2022-03-21 23:13 ` Michael Walle 2022-04-11 7:29 ` Tudor.Ambarus 2022-04-11 7:29 ` Tudor.Ambarus 2022-02-28 11:17 ` [PATCH v2 7/8] mtd: spi-nor: micron-st: Rework spi_nor_micron_octal_dtr_enable() Tudor Ambarus 2022-02-28 11:17 ` Tudor Ambarus 2022-03-21 12:33 ` Pratyush Yadav 2022-03-21 12:33 ` Pratyush Yadav 2022-02-28 11:17 ` [PATCH v2 8/8] mtd: spi-nor: spansion: Rework spi_nor_cypress_octal_dtr_enable() Tudor Ambarus 2022-02-28 11:17 ` Tudor Ambarus 2022-03-21 12:34 ` Pratyush Yadav 2022-03-21 12:34 ` Pratyush Yadav 2022-03-21 13:19 ` Tudor.Ambarus 2022-03-21 13:19 ` 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=20220228111712.111737-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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.