From: Miquel Raynal <miquel.raynal@bootlin.com>
To: Marek Vasut <marex@denx.de>
Cc: Christophe Kerello <christophe.kerello@st.com>,
richard@nod.at, vigneshr@ti.com, lee.jones@linaro.org,
robh+dt@kernel.org, mark.rutland@arm.com, tony@atomide.com,
linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org,
linux-stm32@st-md-mailman.stormreply.com,
devicetree@vger.kernel.org
Subject: Re: [PATCH v2 04/12] mtd: rawnand: stm32_fmc2: manage all errors cases at probe time
Date: Mon, 27 Apr 2020 20:08:48 +0200 [thread overview]
Message-ID: <20200427200848.722f4c56@xps13> (raw)
In-Reply-To: <40a9bac7-9ed4-b781-f2c2-2d90b4e82749@denx.de>
Hi Marek,
Marek Vasut <marex@denx.de> wrote on Mon, 27 Apr 2020 19:59:34 +0200:
> On 4/27/20 7:47 PM, Miquel Raynal wrote:
> > Hi Christophe,
> >
> > Christophe Kerello <christophe.kerello@st.com> wrote on Wed, 15 Apr
> > 2020 17:57:28 +0200:
> >
> >> This patch defers its probe when the expected reset control is not
> >> yet ready. This patch also handles properly all errors cases at probe
> >> time.
> >>
> >> Signed-off-by: Christophe Kerello <christophe.kerello@st.com>
> >> ---
> >> drivers/mtd/nand/raw/stm32_fmc2_nand.c | 13 +++++++++----
> >> 1 file changed, 9 insertions(+), 4 deletions(-)
> >>
> >> diff --git a/drivers/mtd/nand/raw/stm32_fmc2_nand.c b/drivers/mtd/nand/raw/stm32_fmc2_nand.c
> >> index b6d45cd..0a96797 100644
> >> --- a/drivers/mtd/nand/raw/stm32_fmc2_nand.c
> >> +++ b/drivers/mtd/nand/raw/stm32_fmc2_nand.c
> >> @@ -1967,7 +1967,11 @@ static int stm32_fmc2_probe(struct platform_device *pdev)
> >> }
> >>
> >> rstc = devm_reset_control_get(dev, NULL);
> >> - if (!IS_ERR(rstc)) {
> >> + if (IS_ERR(rstc)) {
> >> + ret = PTR_ERR(rstc);
> >> + if (ret == -EPROBE_DEFER)
> >> + goto err_clk_disable;
> >> + } else {
> >> reset_control_assert(rstc);
> >> reset_control_deassert(rstc);
> >> }
> >> @@ -1975,7 +1979,7 @@ static int stm32_fmc2_probe(struct platform_device *pdev)
> >> /* DMA setup */
> >> ret = stm32_fmc2_dma_setup(fmc2);
> >> if (ret)
> >> - return ret;
> >> + goto err_dma_setup;
> >>
> >> /* FMC2 init routine */
> >> stm32_fmc2_init(fmc2);
> >> @@ -1997,7 +2001,7 @@ static int stm32_fmc2_probe(struct platform_device *pdev)
> >> /* Scan to find existence of the device */
> >> ret = nand_scan(chip, nand->ncs);
> >> if (ret)
> >> - goto err_scan;
> >> + goto err_dma_setup;
> >>
> >> ret = mtd_device_register(mtd, NULL, 0);
> >> if (ret)
> >> @@ -2010,7 +2014,7 @@ static int stm32_fmc2_probe(struct platform_device *pdev)
> >> err_device_register:
> >> nand_cleanup(chip);
> >>
> >> -err_scan:
> >> +err_dma_setup:
> >> if (fmc2->dma_ecc_ch)
> >> dma_release_channel(fmc2->dma_ecc_ch);
> >> if (fmc2->dma_tx_ch)
> >> @@ -2021,6 +2025,7 @@ static int stm32_fmc2_probe(struct platform_device *pdev)
> >> sg_free_table(&fmc2->dma_data_sg);
> >> sg_free_table(&fmc2->dma_ecc_sg);
> >>
> >> +err_clk_disable:
> >> clk_disable_unprepare(fmc2->clk);
> >>
> >> return ret;
> >
> > I didn't spot it during my earlier reviews but I really prefer using
> > labels explaining what you do than having the same name of the function
> > which failed. This way you don't have to rework the error path when
> > you handle an additional error.
> >
> > So, would you mind doing this in two steps:
> >
> > 1/
> > Replace
> >
> > err_scan:
> >
> > with, eg.
> >
> > release_dma_objs:
>
> The ^err_ prefix in failpath labels is useful, since it's easily
> possible to match on it with regexes ; not so much on arbitrary label name.
I guess so, but is it actually useful to catch labels in a regex? (real
question)
Any way I suppose catching ":\n" is already a good approximation to
find labels?
>
> btw would it make sense to split the first three patches of this series
> into a separate series ? This rawnand part seems more like an unrelated
> cleanup.
As it seems that the MFD discussion can take longer, then I would say
yes, at least for the cleanup/misc changes part.
Thanks,
Miquèl
next prev parent reply other threads:[~2020-04-27 18:08 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-15 15:57 [PATCH v2 00/12] add STM32 FMC2 controller drivers Christophe Kerello
2020-04-15 15:57 ` [PATCH v2 01/12] dt-bindings: mfd: stm32-fmc2: add STM32 FMC2 controller documentation Christophe Kerello
2020-04-28 15:28 ` Rob Herring
2020-04-29 9:35 ` Christophe Kerello
2020-04-15 15:57 ` [PATCH v2 02/12] mfd: stm32-fmc2: add STM32 FMC2 controller driver Christophe Kerello
2020-04-24 7:45 ` Lee Jones
2020-04-24 10:27 ` Marek Vasut
2020-04-24 10:50 ` Lee Jones
2020-04-24 11:06 ` Marek Vasut
2020-04-24 11:47 ` Christophe Kerello
2020-04-24 14:50 ` Lee Jones
2020-04-24 15:14 ` Boris Brezillon
2020-04-24 16:42 ` Christophe Kerello
2020-04-24 17:22 ` Boris Brezillon
2020-04-24 17:34 ` Christophe Kerello
2020-04-15 15:57 ` [PATCH v2 03/12] bus: stm32-fmc2-ebi: add STM32 FMC2 EBI " Christophe Kerello
2020-04-16 19:53 ` Boris Brezillon
2020-04-17 15:29 ` Christophe Kerello
2020-04-17 15:31 ` Marek Vasut
2020-04-17 15:41 ` Boris Brezillon
2020-04-17 15:44 ` Marek Vasut
2020-04-15 15:57 ` [PATCH v2 04/12] mtd: rawnand: stm32_fmc2: manage all errors cases at probe time Christophe Kerello
2020-04-27 17:47 ` Miquel Raynal
2020-04-27 17:59 ` Marek Vasut
2020-04-27 18:08 ` Miquel Raynal [this message]
2020-04-27 19:46 ` Marek Vasut
2020-04-27 20:08 ` Miquel Raynal
2020-04-27 20:10 ` Marek Vasut
2020-04-29 8:00 ` Christophe Kerello
2020-04-29 9:07 ` Christophe Kerello
2020-04-15 15:57 ` [PATCH v2 05/12] mtd: rawnand: stm32_fmc2: remove useless inline comments Christophe Kerello
2020-04-27 17:48 ` Miquel Raynal
2020-04-15 15:57 ` [PATCH v2 06/12] mtd: rawnand: stm32_fmc2: use FMC2_TIMEOUT_MS for timeouts Christophe Kerello
2020-04-27 18:22 ` Miquel Raynal
2020-04-29 9:27 ` Christophe Kerello
2020-04-29 9:35 ` Miquel Raynal
2020-04-29 9:41 ` Christophe Kerello
2020-04-29 10:06 ` Miquel Raynal
2020-04-29 10:13 ` Christophe Kerello
2020-04-29 10:27 ` Miquel Raynal
2020-04-15 15:57 ` [PATCH v2 07/12] mtd: rawnand: stm32_fmc2: cleanup Christophe Kerello
2020-04-27 18:33 ` Miquel Raynal
2020-04-29 9:31 ` Christophe Kerello
2020-04-15 15:57 ` [PATCH v2 08/12] mtd: rawnand: stm32_fmc2: use FIELD_PREP/FIELD_GET macros Christophe Kerello
2020-04-16 19:45 ` Boris Brezillon
2020-04-27 18:50 ` Miquel Raynal
2020-04-15 15:57 ` [PATCH v2 09/12] mtd: rawnand: stm32_fmc2: move all registers Christophe Kerello
2020-04-15 15:57 ` [PATCH v2 10/12] mtd: rawnand: stm32_fmc2: use regmap APIs Christophe Kerello
2020-04-27 18:52 ` Miquel Raynal
2020-04-15 15:57 ` [PATCH v2 11/12] mtd: rawnand: stm32_fmc2: use stm32_fmc2 structure in nfc controller Christophe Kerello
2020-04-15 15:57 ` [PATCH v2 12/12] mtd: rawnand: stm32_fmc2: add new MP1 compatible string Christophe Kerello
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=20200427200848.722f4c56@xps13 \
--to=miquel.raynal@bootlin.com \
--cc=christophe.kerello@st.com \
--cc=devicetree@vger.kernel.org \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=marex@denx.de \
--cc=mark.rutland@arm.com \
--cc=richard@nod.at \
--cc=robh+dt@kernel.org \
--cc=tony@atomide.com \
--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).