From: <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>, <Takahiro.Kuwano@infineon.com> Subject: Re: [PATCH v4 03/11] mtd: spi-nor: core: Use auto-detection only once Date: Thu, 21 Apr 2022 07:18:21 +0000 [thread overview] Message-ID: <7f570c32-d0be-97ba-0a1b-9aca93cfbbf1@microchip.com> (raw) In-Reply-To: <20220420103427.47867-4-tudor.ambarus@microchip.com> Hi, Pratyush, I forgot to remove few checks, would you please remove them when applying? See below. On 4/20/22 13:34, Tudor Ambarus wrote: > 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> > Reviewed-by: Michael Walle <michael@walle.cc> > --- > 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; As Michael suggested spi_nor_match_name() returns NULL or valid entry, so this check is not necessary, let's remove them. > + } > /* 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; also according to Michael, this change is not needed as spi_nor_get_flash_info() can't return NULL. Here we can keep the code as it was. Let me know if you want me to respin. > + else if (IS_ERR(info)) > return PTR_ERR(info); > > nor->info = info;
WARNING: multiple messages have this Message-ID (diff)
From: <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>, <Takahiro.Kuwano@infineon.com> Subject: Re: [PATCH v4 03/11] mtd: spi-nor: core: Use auto-detection only once Date: Thu, 21 Apr 2022 07:18:21 +0000 [thread overview] Message-ID: <7f570c32-d0be-97ba-0a1b-9aca93cfbbf1@microchip.com> (raw) In-Reply-To: <20220420103427.47867-4-tudor.ambarus@microchip.com> Hi, Pratyush, I forgot to remove few checks, would you please remove them when applying? See below. On 4/20/22 13:34, Tudor Ambarus wrote: > 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> > Reviewed-by: Michael Walle <michael@walle.cc> > --- > 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; As Michael suggested spi_nor_match_name() returns NULL or valid entry, so this check is not necessary, let's remove them. > + } > /* 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; also according to Michael, this change is not needed as spi_nor_get_flash_info() can't return NULL. Here we can keep the code as it was. Let me know if you want me to respin. > + else if (IS_ERR(info)) > return PTR_ERR(info); > > nor->info = info; ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2022-04-21 7:18 UTC|newest] Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-04-20 10:34 [PATCH v4 00/11] mtd: spi-nor: Rework Octal DTR methods Tudor Ambarus 2022-04-20 10:34 ` Tudor Ambarus 2022-04-20 10:34 ` [PATCH v4 01/11] mtd: spi-nor: Rename method, s/spi_nor_match_id/spi_nor_match_name Tudor Ambarus 2022-04-20 10:34 ` Tudor Ambarus 2022-04-20 10:34 ` [PATCH v4 02/11] mtd: spi-nor: Introduce spi_nor_match_id() Tudor Ambarus 2022-04-20 10:34 ` Tudor Ambarus 2022-04-20 10:34 ` [PATCH v4 03/11] mtd: spi-nor: core: Use auto-detection only once Tudor Ambarus 2022-04-20 10:34 ` Tudor Ambarus 2022-04-21 7:18 ` Tudor.Ambarus [this message] 2022-04-21 7:18 ` Tudor.Ambarus 2022-04-21 13:16 ` Pratyush Yadav 2022-04-21 13:16 ` Pratyush Yadav 2022-04-21 13:41 ` Tudor.Ambarus 2022-04-21 13:41 ` Tudor.Ambarus 2022-04-27 5:20 ` Pratyush Yadav 2022-04-27 5:20 ` Pratyush Yadav 2022-04-27 7:13 ` Tudor.Ambarus 2022-04-27 7:13 ` Tudor.Ambarus 2022-04-20 10:34 ` [PATCH v4 04/11] mtd: spi-nor: core: Introduce method for RDID op Tudor Ambarus 2022-04-20 10:34 ` Tudor Ambarus 2022-04-20 10:34 ` [PATCH v4 05/11] mtd: spi-nor: manufacturers: Use spi_nor_read_id() core method Tudor Ambarus 2022-04-20 10:34 ` Tudor Ambarus 2022-04-20 10:34 ` [PATCH v4 06/11] mtd: spi-nor: core: Add helpers to read/write any register Tudor Ambarus 2022-04-20 10:34 ` Tudor Ambarus 2022-04-20 10:34 ` [PATCH v4 07/11] mtd: spi-nor: micron-st: Rework spi_nor_micron_octal_dtr_enable() Tudor Ambarus 2022-04-20 10:34 ` Tudor Ambarus 2022-04-20 10:34 ` [PATCH v4 08/11] mtd: spi-nor: spansion: Rework spi_nor_cypress_octal_dtr_enable() Tudor Ambarus 2022-04-20 10:34 ` Tudor Ambarus 2022-04-20 10:34 ` [PATCH v4 09/11] mtd: spi-nor: Introduce templates for SPI NOR operations Tudor Ambarus 2022-04-20 10:34 ` Tudor Ambarus 2022-04-20 10:34 ` [PATCH v4 10/11] mtd: spi-nor: spansion: Remove status polling on volatile registers write Tudor Ambarus 2022-04-20 10:34 ` Tudor Ambarus 2022-04-20 20:04 ` Michael Walle 2022-04-20 20:04 ` Michael Walle 2022-04-20 10:34 ` [PATCH v4 11/11] mtd: spi-nor: micron-st: " Tudor Ambarus 2022-04-20 10:34 ` Tudor Ambarus 2022-04-20 20:05 ` Michael Walle 2022-04-20 20:05 ` Michael Walle 2022-04-27 9:31 ` [PATCH v4 00/11] mtd: spi-nor: Rework Octal DTR methods Pratyush Yadav 2022-04-27 9:31 ` 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=7f570c32-d0be-97ba-0a1b-9aca93cfbbf1@microchip.com \ --to=tudor.ambarus@microchip.com \ --cc=Takahiro.Kuwano@infineon.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mtd@lists.infradead.org \ --cc=michael@walle.cc \ --cc=miquel.raynal@bootlin.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.