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.2 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 A8623C55189 for ; Wed, 22 Apr 2020 07:10:44 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5EB012070B for ; Wed, 22 Apr 2020 07:10:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="gjDu6fuQ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5EB012070B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=collabora.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mtd-bounces+linux-mtd=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=v1+zzPAFBtghq0hpdicZFz8kblKHXaWADZzDVAAGgTk=; b=gjDu6fuQKPZJqs mgQC/pBIyl74fjjq5fc4sSBhuPVTHb+aO5uNWN8zPMehuNGC5oit8sx3B1ifMtvXcz7QyC8CgXg0L A6bCgrhXgxSqgnSMWRjczZifOYMfQharg2T4k15UFKwGLcAS0pA1ajM7GWkGMv2+654ttvwX5M/i6 v2j6E6c2Uks3bjBHeX3ApwfvzALev+Gh1sD8sqB4y1hHyhs2TkyweriRHt9BodFZn3vEA3N11tH76 zDU2tfgilWed8MpCiUi5PFwKGPUBvL7ztwPiIu5WAF+EYzZ06rDuXSHkSWLP+RedMhf24RcZhquBU Ay1c3zovUjBZLuo639Zw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jR9Wl-00046Y-Do; Wed, 22 Apr 2020 07:10:35 +0000 Received: from bhuna.collabora.co.uk ([46.235.227.227]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jR9Wi-00045L-IS for linux-mtd@lists.infradead.org; Wed, 22 Apr 2020 07:10:33 +0000 Received: from localhost (unknown [IPv6:2a01:e0a:2c:6930:b93f:9fae:b276:a89a]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: bbrezillon) by bhuna.collabora.co.uk (Postfix) with ESMTPSA id 39FE32A17E5; Wed, 22 Apr 2020 08:10:31 +0100 (BST) Date: Wed, 22 Apr 2020 09:10:27 +0200 From: Boris Brezillon To: Miquel Raynal Subject: Re: [PATCH 4/6] mtd: rawnand: marvell: Fix probe error path Message-ID: <20200422091027.1b2af264@collabora.com> In-Reply-To: <20200421164857.8255-5-miquel.raynal@bootlin.com> References: <20200421164857.8255-1-miquel.raynal@bootlin.com> <20200421164857.8255-5-miquel.raynal@bootlin.com> Organization: Collabora X-Mailer: Claws Mail 3.17.5 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200422_001032_739631_674275DB X-CRM114-Status: GOOD ( 17.41 ) X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Weinberger , linux-mtd@lists.infradead.org, Vignesh Raghavendra , Thomas Petazzoni , Tudor Ambarus Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-mtd" Errors-To: linux-mtd-bounces+linux-mtd=archiver.kernel.org@lists.infradead.org On Tue, 21 Apr 2020 18:48:55 +0200 Miquel Raynal wrote: > Ensure all chips are deregistered and cleaned in case of error during > the probe. > > Fixes: 02f26ecf8c77 ("mtd: nand: add reworked Marvell NAND controller driver") > Signed-off-by: Miquel Raynal > --- > drivers/mtd/nand/raw/marvell_nand.c | 21 +++++++++++---------- > 1 file changed, 11 insertions(+), 10 deletions(-) > > diff --git a/drivers/mtd/nand/raw/marvell_nand.c b/drivers/mtd/nand/raw/marvell_nand.c > index 350949b34eee..cb1e1a295002 100644 > --- a/drivers/mtd/nand/raw/marvell_nand.c > +++ b/drivers/mtd/nand/raw/marvell_nand.c > @@ -2673,6 +2673,16 @@ static int marvell_nand_chip_init(struct device *dev, struct marvell_nfc *nfc, > return 0; > } > > +static void marvell_nand_chips_cleanup(struct marvell_nfc *nfc) > +{ > + struct marvell_nand_chip *entry, *temp; > + > + list_for_each_entry_safe(entry, temp, &nfc->chips, node) { > + nand_release(&entry->chip); > + list_del(&entry->node); > + } > +} > + > static int marvell_nand_chips_init(struct device *dev, struct marvell_nfc *nfc) > { > struct device_node *np = dev->of_node; > @@ -2707,6 +2717,7 @@ static int marvell_nand_chips_init(struct device *dev, struct marvell_nfc *nfc) > ret = marvell_nand_chip_init(dev, nfc, nand_np); > if (ret) { > of_node_put(nand_np); > + marvell_nand_chips_cleanup(nfc); > return ret; I'd rather add an err_chips_cleanup label for that one so you don't have to duplicate it if there are other error paths where this cleanup is needed. > } > } > @@ -2714,16 +2725,6 @@ static int marvell_nand_chips_init(struct device *dev, struct marvell_nfc *nfc) > return 0; > } > > -static void marvell_nand_chips_cleanup(struct marvell_nfc *nfc) > -{ > - struct marvell_nand_chip *entry, *temp; > - > - list_for_each_entry_safe(entry, temp, &nfc->chips, node) { > - nand_release(&entry->chip); > - list_del(&entry->node); > - } > -} > - > static int marvell_nfc_init_dma(struct marvell_nfc *nfc) > { > struct platform_device *pdev = container_of(nfc->dev, ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/