From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DEB88C4CECC for ; Mon, 27 Apr 2020 18:08:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BE0C2214D8 for ; Mon, 27 Apr 2020 18:08:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726189AbgD0SIx convert rfc822-to-8bit (ORCPT ); Mon, 27 Apr 2020 14:08:53 -0400 Received: from relay9-d.mail.gandi.net ([217.70.183.199]:36851 "EHLO relay9-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725963AbgD0SIx (ORCPT ); Mon, 27 Apr 2020 14:08:53 -0400 X-Originating-IP: 91.224.148.103 Received: from xps13 (unknown [91.224.148.103]) (Authenticated sender: miquel.raynal@bootlin.com) by relay9-d.mail.gandi.net (Postfix) with ESMTPSA id 621E0FF80C; Mon, 27 Apr 2020 18:08:49 +0000 (UTC) Date: Mon, 27 Apr 2020 20:08:48 +0200 From: Miquel Raynal To: Marek Vasut Cc: Christophe Kerello , 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 Message-ID: <20200427200848.722f4c56@xps13> In-Reply-To: <40a9bac7-9ed4-b781-f2c2-2d90b4e82749@denx.de> References: <1586966256-29548-1-git-send-email-christophe.kerello@st.com> <1586966256-29548-5-git-send-email-christophe.kerello@st.com> <20200427194747.224a2402@xps13> <40a9bac7-9ed4-b781-f2c2-2d90b4e82749@denx.de> Organization: Bootlin X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Hi Marek, Marek Vasut wrote on Mon, 27 Apr 2020 19:59:34 +0200: > On 4/27/20 7:47 PM, Miquel Raynal wrote: > > Hi Christophe, > > > > Christophe Kerello 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 > >> --- > >> 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