[{"id":1767172,"web_url":"http://patchwork.ozlabs.org/comment/1767172/","msgid":"<66c9e0a2-f216-181c-d35e-1e09434a923a@baylibre.com>","list_archive_url":null,"date":"2017-09-12T15:41:56","subject":"Re: [PATCH] mtd: oxnas_nand: Fix error handling in\n\toxnas_nand_probe()","submitter":{"id":67289,"url":"http://patchwork.ozlabs.org/api/people/67289/","name":"Neil Armstrong","email":"narmstrong@baylibre.com"},"content":"On 09/09/2017 12:00 AM, Alexey Khoroshilov wrote:\n> oxnas_nand_probe() does not disable clock on error paths.\n> The patch adds disabling using devm interface.\n> \n> Found by Linux Driver Verification project (linuxtesting.org).\n> \n> Signed-off-by: Alexey Khoroshilov \n> ---\n> drivers/mtd/nand/oxnas_nand.c | 22 +++++++++++++++-------\n> 1 file changed, 15 insertions(+), 7 deletions(-)\n> \n> diff --git a/drivers/mtd/nand/oxnas_nand.c b/drivers/mtd/nand/oxnas_nand.c\n> index 1b207aac840c..8abc69a285dd 100644\n> --- a/drivers/mtd/nand/oxnas_nand.c\n> +++ b/drivers/mtd/nand/oxnas_nand.c\n> @@ -103,16 +103,26 @@ static int oxnas_nand_probe(struct platform_device *pdev)\n> \tif (IS_ERR(oxnas->io_base))\n> \t\treturn PTR_ERR(oxnas->io_base);\n> \n> -\toxnas->clk = devm_clk_get(&pdev->dev, NULL);\n> -\tif (IS_ERR(oxnas->clk))\n> -\t\toxnas->clk = NULL;\n> -\n> \t/* Only a single chip node is supported */\n> \tcount = of_get_child_count(np);\n> \tif (count > 1)\n> \t\treturn -EINVAL;\n> \n> -\tclk_prepare_enable(oxnas->clk);\n> +\toxnas->clk = devm_clk_get(&pdev->dev, NULL);\n> +\tif (IS_ERR(oxnas->clk)) {\n> +\t\toxnas->clk = NULL;\n> +\t} else {\n> +\t\terr = clk_prepare_enable(oxnas->clk);\n> +\t\tif (err)\n> +\t\t\treturn err;\n> +\n> +\t\terr = devm_add_action_or_reset(&pdev->dev,\n> +\t\t\t\t(void(*)(void *))clk_disable_unprepare,\n> +\t\t\t\toxnas->clk);\n> +\t\tif (err)\n> +\t\t\treturn err;\n> +\t}\n> +\n> \tdevice_reset_optional(&pdev->dev);\n> \n> \tfor_each_child_of_node(np, nand_np) {\n> @@ -167,8 +177,6 @@ static int oxnas_nand_remove(struct platform_device *pdev)\n> \tif (oxnas->chips[0])\n> \t\tnand_release(nand_to_mtd(oxnas->chips[0]));\n> \n> -\tclk_disable_unprepare(oxnas->clk);\n> -\n> \treturn 0;\n> }\n> \n> \n\n\nAcked-by: Neil Armstrong ","headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org; spf=none (mailfrom)\n\tsmtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133;\n\thelo=bombadil.infradead.org;\n\tenvelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org;\n\treceiver=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=lists.infradead.org\n\theader.i=@lists.infradead.org header.b=\"VFHXEwxW\"; \n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=baylibre-com.20150623.gappssmtp.com\n\theader.i=@baylibre-com.20150623.gappssmtp.com\n\theader.b=\"rG2oQPXP\"; dkim-atps=neutral"],"Received":["from bombadil.infradead.org (bombadil.infradead.org\n\t[65.50.211.133])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xs8G01f2qz9s7f\n\tfor ;\n\tWed, 13 Sep 2017 01:43:20 +1000 (AEST)","from localhost ([127.0.0.1] helo=bombadil.infradead.org)\n\tby bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux))\n\tid 1drnLD-0003dE-Ke; Tue, 12 Sep 2017 15:43:11 +0000","from mail-wm0-x232.google.com ([2a00:1450:400c:c09::232])\n\tby bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux))\n\tid 1drnKW-0003K3-JY\n\tfor linux-mtd@lists.infradead.org; Tue, 12 Sep 2017 15:42:31 +0000","by mail-wm0-x232.google.com with SMTP id f199so60442715wme.0\n\tfor ;\n\tTue, 12 Sep 2017 08:42:07 -0700 (PDT)","from [192.168.1.21] ([90.63.244.31])\n\tby smtp.gmail.com with ESMTPSA id\n\tx185sm1043998wmx.35.2017.09.12.08.42.04\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tTue, 12 Sep 2017 08:42:04 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=lists.infradead.org; s=bombadil.20170209; h=Sender:\n\tContent-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post:\n\tList-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:\n\tMessage-ID:From:References:To:Subject:Reply-To:Content-ID:Content-Description\n\t:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:\n\tList-Owner; bh=bdqgliuPllBKwuY5BlNGyAGCknNpAKUCynJN4jxl0qk=;\n\tb=VFHXEwxW95XMcI\n\tQawdUemlgrG7qULhyS29SxzsRocFeVrxAYqUtpfF+DLsZ1t7zeZGPauhW1SKBBhage2WkW2XgQFz6\n\txVXqEd4bhfXXhSes9t2s/fqWYCg4LfYM58CiU4VYbeLJoHoxKbxgOLIc+/7ha96ov5gapeFyBaldD\n\t6LXy+DGrh/WiYKvqGa0KNeSHeEkwKOTfmPvFtgWeLHJYklOyVfudyc2ueqEjTnBaqoMqz6eUBevx3\n\t0dB1jlUVZPust8/KEuLJT3ua9zv+2v/jqbz2NAgEaTAp6Yct1MER0M4evuKxL+HDpCyhFLsx/AmZt\n\t9TboHneFzBq1NI11+dcA==;","v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=baylibre-com.20150623.gappssmtp.com; s=20150623;\n\th=subject:to:cc:references:from:organization:message-id:date\n\t:user-agent:mime-version:in-reply-to:content-language\n\t:content-transfer-encoding;\n\tbh=KHur6JEfN4gQPC9X0FyzBA2e3Xul6D+/gdSzmX5RBog=;\n\tb=rG2oQPXPOAxxFZcJUNKlVcK90gia6KRSE4ml/f5Y5mSpFwB8AfvIA8l7PAmqGRj1Qy\n\tG2KZIczGacwDi8J0xnjMxGqxi5T3PPdYRVQsmn4Bqi2wjVVmHTYMBchGxWJ/C9+WxIwk\n\tPblpoMeBtGkJiRKvoLYmglHCFVftkVhKyXQQcctKWE0Piu7HMpPDx2ZD1Iw1dtuCtQw7\n\tpIM9FhqqXabX1uP/6Q6TfPIRkdDIXBv0jPNNLGAWX+PwIB0JZ/JqHBC01c2CMUROMEpx\n\tE7IVf5Uvc3CdyNkEPMu6xpPiDDe/MjYJUn5k0ammBjpC6ERHzkj2+hq9sC2J4BePy47J\n\tWLOQ=="],"X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:subject:to:cc:references:from:organization\n\t:message-id:date:user-agent:mime-version:in-reply-to\n\t:content-language:content-transfer-encoding;\n\tbh=KHur6JEfN4gQPC9X0FyzBA2e3Xul6D+/gdSzmX5RBog=;\n\tb=uIuBxIWowG4phwTHATDh2UEFUx7N9f/Lb3Hgk4ncVqUiUNE9VRtqJYRWPBui+qZ+tX\n\tw8uiCQgx1Gu1n7NMukO0PWaA0SKnsYScg2TgqWFkNlzDwrAYMKlmcFV+DL/XODgRVj+u\n\tU9Y31G0L6HTd0UpBQDTSCj0S8Zq/iHNQ3pQCLNcHovr4YvDd442+jeREZVHXwVKAEuXh\n\tMh3HzVh87Z7ggNdN++zI6vB3rNx2oLjTL27qoQgKwYJqJpSTJ17tb/swGO07GMJmCsdr\n\t3A1rRDhMIa/lvldtaRQEoMzQLSwDNsTHEfszHpkNEihQae4IYX5In6H1tPZoxWPMeL4T\n\tKOBg==","X-Gm-Message-State":"AHPjjUhJLrFCH4U2kP2A+VggSsEFngvIOeZDKxCUjAXxUfQkCq2gmY2Q\n\tM12uqrn/XFGFhdSKlA2LV24GgA==","X-Google-Smtp-Source":"AOwi7QB8FnAXnxNzwX/BuaYsLUG4stcq84NT8S/k/53TuhoWS4dyQLzfDG8vPIWbeyrcA4HDdJyu7g==","X-Received":"by 10.28.234.196 with SMTP id g65mr198948wmi.73.1505230925746;\n\tTue, 12 Sep 2017 08:42:05 -0700 (PDT)","Subject":"Re: [PATCH] mtd: oxnas_nand: Fix error handling in\n\toxnas_nand_probe()","To":"Alexey Khoroshilov ,\n\tBoris Brezillon ,\n\tBrian Norris ","References":"<1504908038-26285-1-git-send-email-khoroshilov@ispras.ru>","From":"Neil Armstrong ","Organization":"Baylibre","Message-ID":"<66c9e0a2-f216-181c-d35e-1e09434a923a@baylibre.com>","Date":"Tue, 12 Sep 2017 17:41:56 +0200","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101\n\tThunderbird/52.2.1","MIME-Version":"1.0","In-Reply-To":"<1504908038-26285-1-git-send-email-khoroshilov@ispras.ru>","Content-Language":"en-US","X-CRM114-Version":"20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 ","X-CRM114-CacheID":"sfid-20170912_084228_898999_A128ADEA ","X-CRM114-Status":"GOOD ( 16.01 )","X-Spam-Score":"-1.9 (-)","X-Spam-Report":"SpamAssassin version 3.4.1 on bombadil.infradead.org summary:\n\tContent analysis details: (-1.9 points)\n\tpts rule name description\n\t---- ----------------------\n\t--------------------------------------------------\n\t-0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/,\n\tlow\n\ttrust [2a00:1450:400c:c09:0:0:0:232 listed in] [list.dnswl.org]\n\t0.7 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail)\n\t-1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1%\n\t[score: 0.0000]\n\t-0.1 DKIM_VALID Message has at least one valid DKIM or DK signature\n\t0.1 DKIM_SIGNED Message has a DKIM or DK signature,\n\tnot necessarily valid","X-BeenThere":"linux-mtd@lists.infradead.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"Linux MTD discussion mailing list ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"ldv-project@linuxtesting.org, linux-oxnas@lists.tuxfamily.org,\n\tlinux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org,\n\tlinux-arm-kernel@lists.infradead.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Sender":"\"linux-mtd\" ","Errors-To":"linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org"}},{"id":1770054,"web_url":"http://patchwork.ozlabs.org/comment/1770054/","msgid":"<20170918121409.03e4b978@bbrezillon>","list_archive_url":null,"date":"2017-09-18T10:14:09","subject":"Re: [PATCH] mtd: oxnas_nand: Fix error handling in\n\toxnas_nand_probe()","submitter":{"id":63120,"url":"http://patchwork.ozlabs.org/api/people/63120/","name":"Boris Brezillon","email":"boris.brezillon@free-electrons.com"},"content":"Hi Alexey,\n\nOn Sat, 9 Sep 2017 01:00:38 +0300\nAlexey Khoroshilov wrote:\n\n> oxnas_nand_probe() does not disable clock on error paths.\n> The patch adds disabling using devm interface.\n> \n> Found by Linux Driver Verification project (linuxtesting.org).\n> \n> Signed-off-by: Alexey Khoroshilov \n> ---\n> drivers/mtd/nand/oxnas_nand.c | 22 +++++++++++++++-------\n> 1 file changed, 15 insertions(+), 7 deletions(-)\n> \n> diff --git a/drivers/mtd/nand/oxnas_nand.c b/drivers/mtd/nand/oxnas_nand.c\n> index 1b207aac840c..8abc69a285dd 100644\n> --- a/drivers/mtd/nand/oxnas_nand.c\n> +++ b/drivers/mtd/nand/oxnas_nand.c\n> @@ -103,16 +103,26 @@ static int oxnas_nand_probe(struct platform_device *pdev)\n> \tif (IS_ERR(oxnas->io_base))\n> \t\treturn PTR_ERR(oxnas->io_base);\n> \n> -\toxnas->clk = devm_clk_get(&pdev->dev, NULL);\n> -\tif (IS_ERR(oxnas->clk))\n> -\t\toxnas->clk = NULL;\n> -\n> \t/* Only a single chip node is supported */\n> \tcount = of_get_child_count(np);\n> \tif (count > 1)\n> \t\treturn -EINVAL;\n> \n> -\tclk_prepare_enable(oxnas->clk);\n> +\toxnas->clk = devm_clk_get(&pdev->dev, NULL);\n> +\tif (IS_ERR(oxnas->clk)) {\n> +\t\toxnas->clk = NULL;\n> +\t} else {\n> +\t\terr = clk_prepare_enable(oxnas->clk);\n> +\t\tif (err)\n> +\t\t\treturn err;\n> +\n> +\t\terr = devm_add_action_or_reset(&pdev->dev,\n> +\t\t\t\t(void(*)(void *))clk_disable_unprepare,\n> +\t\t\t\toxnas->clk);\n> +\t\tif (err)\n> +\t\t\treturn err;\n> +\t}\n> +\n\nLooks like something that should be made available at the CCF level\neither with a devm_clk_get_prepare_enable() or with a\ndevm_clk_prepare_enable() helper. Would you care proposing this change\nto the CCF ML?\n\nIn the meantime can you provide a simpler fix that just adds the\nmissing clk_disable_unprepare() call in the error path?\n\n> \tdevice_reset_optional(&pdev->dev);\n> \n> \tfor_each_child_of_node(np, nand_np) {\n> @@ -167,8 +177,6 @@ static int oxnas_nand_remove(struct platform_device *pdev)\n> \tif (oxnas->chips[0])\n> \t\tnand_release(nand_to_mtd(oxnas->chips[0]));\n> \n> -\tclk_disable_unprepare(oxnas->clk);\n> -\n> \treturn 0;\n> }\n>","headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org; spf=none (mailfrom)\n\tsmtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133;\n\thelo=bombadil.infradead.org;\n\tenvelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org;\n\treceiver=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=lists.infradead.org\n\theader.i=@lists.infradead.org header.b=\"BeK4oapz\"; \n\tdkim-atps=neutral"],"Received":["from bombadil.infradead.org (bombadil.infradead.org\n\t[65.50.211.133])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xwhhZ51Zgz9ryr\n\tfor ;\n\tMon, 18 Sep 2017 20:15:10 +1000 (AEST)","from localhost ([127.0.0.1] helo=bombadil.infradead.org)\n\tby bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux))\n\tid 1dtt4z-000804-2L; Mon, 18 Sep 2017 10:15:05 +0000","from mail.free-electrons.com ([62.4.15.54])\n\tby bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux))\n\tid 1dtt4a-0007bH-LX; Mon, 18 Sep 2017 10:14:42 +0000","by mail.free-electrons.com (Postfix, from userid 110)\n\tid 61F8B208D8; Mon, 18 Sep 2017 12:14:19 +0200 (CEST)","from bbrezillon (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr\n\t[90.63.216.87])\n\tby mail.free-electrons.com (Postfix) with ESMTPSA id 23B102087D;\n\tMon, 18 Sep 2017 12:14:09 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=lists.infradead.org; s=bombadil.20170209; h=Sender:\n\tContent-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post:\n\tList-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:\n\tMessage-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description:\n\tResent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:\n\tList-Owner; bh=cmBQzl6tuFDvS8/Bfdlf9a8eJwzNxAX0akvvvx6jrWY=;\n\tb=BeK4oapznCTg+o\n\txOVmJjKGJLGWtBWFLoi6gjt64S5fC8j3RNiH+U4/KYROSEPSQRBJcChMC+8POjisRtnN+YeuEw4QX\n\tLXxAhtpRSDH/hFLW0LpXm7YskdnAF+HIeWCce95oytcUNaFj/pBpdNUkzOPF4ATwD5tXv+zpcyncQ\n\tQzNKwQD6uLpxgYe6Tqca49HO2MVKWTLJIAcFBCWp0psrB61lpQuA4sG+Vk690qNu5QC+oTAyacOfv\n\tPHntxsDdqpEKu3WXbzRCfECgJ2PD5iDZF+OrYnOnlb7CSkWK5ioJ0h3sScGN2AK9Px2jebodKNj2R\n\th17QPn9wMJ/+1DxO+Sdw==;","X-Spam-Checker-Version":"SpamAssassin 3.4.0 (2014-02-07) on\n\tmail.free-electrons.com","X-Spam-Level":"","X-Spam-Status":"No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT\n\tshortcircuit=ham autolearn=disabled version=3.4.0","Date":"Mon, 18 Sep 2017 12:14:09 +0200","From":"Boris Brezillon ","To":"Alexey Khoroshilov ","Subject":"Re: [PATCH] mtd: oxnas_nand: Fix error handling in\n\toxnas_nand_probe()","Message-ID":"<20170918121409.03e4b978@bbrezillon>","In-Reply-To":"<1504908038-26285-1-git-send-email-khoroshilov@ispras.ru>","References":"<1504908038-26285-1-git-send-email-khoroshilov@ispras.ru>","X-Mailer":"Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu)","MIME-Version":"1.0","X-CRM114-Version":"20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 ","X-CRM114-CacheID":"sfid-20170918_031440_856537_FEFCD8FD ","X-CRM114-Status":"GOOD ( 16.93 )","X-Spam-Score":"-1.9 (-)","X-Spam-Report":"SpamAssassin version 3.4.1 on bombadil.infradead.org summary:\n\tContent analysis details: (-1.9 points)\n\tpts rule name description\n\t---- ----------------------\n\t--------------------------------------------------\n\t-0.0 SPF_PASS SPF: sender matches SPF record\n\t-0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay\n\tdomain\n\t-1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1%\n\t[score: 0.0000]","X-BeenThere":"linux-mtd@lists.infradead.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"Linux MTD discussion mailing list ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"ldv-project@linuxtesting.org, Neil Armstrong , \n\tlinux-oxnas@lists.tuxfamily.org, linux-kernel@vger.kernel.org,\n\tlinux-mtd@lists.infradead.org,\n\tBrian Norris , \n\tlinux-arm-kernel@lists.infradead.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Sender":"\"linux-mtd\" ","Errors-To":"linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org"}},{"id":1770058,"web_url":"http://patchwork.ozlabs.org/comment/1770058/","msgid":"<87e7ab4e-d3fa-9207-c90c-c2c55b75aaed@baylibre.com>","list_archive_url":null,"date":"2017-09-18T10:24:38","subject":"Re: [PATCH] mtd: oxnas_nand: Fix error handling in\n\toxnas_nand_probe()","submitter":{"id":67289,"url":"http://patchwork.ozlabs.org/api/people/67289/","name":"Neil Armstrong","email":"narmstrong@baylibre.com"},"content":"On 09/18/2017 12:14 PM, Boris Brezillon wrote:\n> Hi Alexey,\n> \n> On Sat, 9 Sep 2017 01:00:38 +0300\n> Alexey Khoroshilov wrote:\n> \n>> oxnas_nand_probe() does not disable clock on error paths.\n>> The patch adds disabling using devm interface.\n>>\n>> Found by Linux Driver Verification project (linuxtesting.org).\n>>\n>> Signed-off-by: Alexey Khoroshilov \n>> ---\n>> drivers/mtd/nand/oxnas_nand.c | 22 +++++++++++++++-------\n>> 1 file changed, 15 insertions(+), 7 deletions(-)\n>>\n>> diff --git a/drivers/mtd/nand/oxnas_nand.c b/drivers/mtd/nand/oxnas_nand.c\n>> index 1b207aac840c..8abc69a285dd 100644\n>> --- a/drivers/mtd/nand/oxnas_nand.c\n>> +++ b/drivers/mtd/nand/oxnas_nand.c\n>> @@ -103,16 +103,26 @@ static int oxnas_nand_probe(struct platform_device *pdev)\n>> \tif (IS_ERR(oxnas->io_base))\n>> \t\treturn PTR_ERR(oxnas->io_base);\n>> \n>> -\toxnas->clk = devm_clk_get(&pdev->dev, NULL);\n>> -\tif (IS_ERR(oxnas->clk))\n>> -\t\toxnas->clk = NULL;\n>> -\n>> \t/* Only a single chip node is supported */\n>> \tcount = of_get_child_count(np);\n>> \tif (count > 1)\n>> \t\treturn -EINVAL;\n>> \n>> -\tclk_prepare_enable(oxnas->clk);\n>> +\toxnas->clk = devm_clk_get(&pdev->dev, NULL);\n>> +\tif (IS_ERR(oxnas->clk)) {\n>> +\t\toxnas->clk = NULL;\n>> +\t} else {\n>> +\t\terr = clk_prepare_enable(oxnas->clk);\n>> +\t\tif (err)\n>> +\t\t\treturn err;\n>> +\n>> +\t\terr = devm_add_action_or_reset(&pdev->dev,\n>> +\t\t\t\t(void(*)(void *))clk_disable_unprepare,\n>> +\t\t\t\toxnas->clk);\n>> +\t\tif (err)\n>> +\t\t\treturn err;\n>> +\t}\n>> +\n> \n> Looks like something that should be made available at the CCF level\n> either with a devm_clk_get_prepare_enable() or with a\n> devm_clk_prepare_enable() helper. Would you care proposing this change\n> to the CCF ML?\n> \n> In the meantime can you provide a simpler fix that just adds the\n> missing clk_disable_unprepare() call in the error path?\n> \n>> \tdevice_reset_optional(&pdev->dev);\n>> \n>> \tfor_each_child_of_node(np, nand_np) {\n>> @@ -167,8 +177,6 @@ static int oxnas_nand_remove(struct platform_device *pdev)\n>> \tif (oxnas->chips[0])\n>> \t\tnand_release(nand_to_mtd(oxnas->chips[0]));\n>> \n>> -\tclk_disable_unprepare(oxnas->clk);\n>> -\n>> \treturn 0;\n>> }\n>> \n> \n\nHi Boris,\n\nI would also like this to be simpler, but this is the actual way to workaround the lack of advanced devm_ calls from CCF.\n\nIs it an issue to keep this change ?\n\nNeil","headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org; spf=none (mailfrom)\n\tsmtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133;\n\thelo=bombadil.infradead.org;\n\tenvelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org;\n\treceiver=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=lists.infradead.org\n\theader.i=@lists.infradead.org header.b=\"pG8ulGCE\"; \n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=baylibre-com.20150623.gappssmtp.com\n\theader.i=@baylibre-com.20150623.gappssmtp.com\n\theader.b=\"maJn00iP\"; dkim-atps=neutral"],"Received":["from bombadil.infradead.org (bombadil.infradead.org\n\t[65.50.211.133])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xwhwS0Qddz9s7M\n\tfor ;\n\tMon, 18 Sep 2017 20:25:28 +1000 (AEST)","from localhost ([127.0.0.1] helo=bombadil.infradead.org)\n\tby bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux))\n\tid 1dttEr-0005WC-St; Mon, 18 Sep 2017 10:25:17 +0000","from mail-wr0-x22f.google.com ([2a00:1450:400c:c0c::22f])\n\tby bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux))\n\tid 1dttEc-0004IA-UE\n\tfor linux-mtd@lists.infradead.org; Mon, 18 Sep 2017 10:25:15 +0000","by mail-wr0-x22f.google.com with SMTP id u96so45262wrb.6\n\tfor ;\n\tMon, 18 Sep 2017 03:24:42 -0700 (PDT)","from [192.168.1.21] ([90.63.244.31])\n\tby smtp.gmail.com with ESMTPSA id\n\tm201sm5833350wma.13.2017.09.18.03.24.39\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tMon, 18 Sep 2017 03:24:40 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=lists.infradead.org; s=bombadil.20170209; h=Sender:\n\tContent-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post:\n\tList-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:\n\tMessage-ID:From:References:To:Subject:Reply-To:Content-ID:Content-Description\n\t:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:\n\tList-Owner; bh=9nBH8QHUIvA5NfBftCuXgJ9uCDKmnF5d8NSF17tZNIs=;\n\tb=pG8ulGCEAMwKiL\n\tvS6Q/pZAye4sOsPwN0wOYyruGvjCnE1AME1ox1Ci+x0d4j3D/bYta6ZMdhQAv4yKjQcWJomnrSLyW\n\txH0UVesZteAcoD9TE80g1d0wOku7y0eQ9Fbk8KDsCuF1/uubskfR2syXV6SGofgqDG261sgE/t1ce\n\tYIkgA0TUYyfuZxvq2VpNgF3HvlR0CiTg6uDkPznTuntWaP5t4p4pOsoTiqHrcdztJmaa0qedp55v4\n\t8RIKYqQQ4VuEdsQFx6RwGuwjq0iOPrdBPU/p7HkGDfZs48UkwzIP7In41o4YWAeFnFOQtXR+qqh4Y\n\tfVs2UvZ/IGYl92UQUohw==;","v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=baylibre-com.20150623.gappssmtp.com; s=20150623;\n\th=subject:to:cc:references:from:organization:message-id:date\n\t:user-agent:mime-version:in-reply-to:content-language\n\t:content-transfer-encoding;\n\tbh=6ugfF9h3bx7R49quhrnQ3kgmHDb2rb7cUIYZSiGih5Y=;\n\tb=maJn00iP6p3hDlmZxxGfy7vjta5DnA3rSirRpMFP70OsFCsTJ0Zky8/zeXkwgKDVvF\n\tRwiFXMOFyn6va4GoZ8uLsTVT/xZCeI5LfeTrOhVPe9T4t99HDa7Y6I0L5+8GCe9693Ie\n\tNXtzGPvwvRVkTuCIjvvdW/BrUO5XjLjQ9nUZruMapOlvjlooIsBdLnsw79FCqcP0D78/\n\tn/jcxoz8SwZL7hlpLngLtfw68AtmXRedDlgFqVdndOQUUUcL3sqx9wqkw0uK64zCI1DL\n\tSq6JP32az8AUDRsJ+tricPQIPalfA8fTIaP3JniXIA/JdVy+YzahjCUyuyASZO7dGMfb\n\tgAGw=="],"X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:subject:to:cc:references:from:organization\n\t:message-id:date:user-agent:mime-version:in-reply-to\n\t:content-language:content-transfer-encoding;\n\tbh=6ugfF9h3bx7R49quhrnQ3kgmHDb2rb7cUIYZSiGih5Y=;\n\tb=btkybSnDiuXSVk9uIW7jJF1LOxmzLfrYodIsw9c2sFV1yPz4EiqcxTBx82z8CxYWxJ\n\tUqHaE7WdMxWAp1qmLXr5nAH0FRDgTg6XKbP57WzUav+yJRHAdXPu4/0YhnER9gIvLPmo\n\tUfm/397FHAITdRnO3rME0N6FAhm+dXLyfr1QF/umSqU6H4F7WK6eOY/Nin7GQeXKL1ma\n\t1rPRB3KtCYyyAADvGFnU7wg7HHBwlPY6FUTlwiJTtg1Di/+GPNpVpVmZOy71KFEeBY4n\n\t651XWl8SmXuCsLymZvU+vQznXJRcY4ubxYFNc0UGZEwnTx33GUirCbc+q1Sjf8ijArpL\n\teZuw==","X-Gm-Message-State":"AHPjjUgD5OcYm/nRYXpWFznvU1Ka7Df1AlSPNO9XMvhCz5wkdZVnJL2W\n\tKO3ESx1pdnB+oZ34","X-Google-Smtp-Source":"ADKCNb520S3Uji/BXVWxzbjc50p2H+QMZDTf9f4ealyGAPT/+mxJL4ntC9foAaj2aBHdlxE+mf0iCw==","X-Received":"by 10.223.157.11 with SMTP id k11mr30157042wre.252.1505730280483;\n\tMon, 18 Sep 2017 03:24:40 -0700 (PDT)","Subject":"Re: [PATCH] mtd: oxnas_nand: Fix error handling in\n\toxnas_nand_probe()","To":"Boris Brezillon ,\n\tAlexey Khoroshilov ","References":"<1504908038-26285-1-git-send-email-khoroshilov@ispras.ru>\n\t<20170918121409.03e4b978@bbrezillon>","From":"Neil Armstrong ","Organization":"Baylibre","Message-ID":"<87e7ab4e-d3fa-9207-c90c-c2c55b75aaed@baylibre.com>","Date":"Mon, 18 Sep 2017 12:24:38 +0200","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101\n\tThunderbird/52.3.0","MIME-Version":"1.0","In-Reply-To":"<20170918121409.03e4b978@bbrezillon>","Content-Language":"en-US","X-CRM114-Version":"20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 ","X-CRM114-CacheID":"sfid-20170918_032503_361668_B311EB6C ","X-CRM114-Status":"GOOD ( 20.03 )","X-Spam-Score":"-1.2 (-)","X-Spam-Report":"SpamAssassin version 3.4.1 on bombadil.infradead.org summary:\n\tContent analysis details: (-1.2 points)\n\tpts rule name description\n\t---- ----------------------\n\t--------------------------------------------------\n\t-0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/,\n\tno\n\ttrust [2a00:1450:400c:c0c:0:0:0:22f listed in] [list.dnswl.org]\n\t0.7 SPF_SOFTFAIL SPF: sender does not match SPF record (softfail)\n\t-1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1%\n\t[score: 0.0000]\n\t-0.1 DKIM_VALID Message has at least one valid DKIM or DK signature\n\t0.1 DKIM_SIGNED Message has a DKIM or DK signature,\n\tnot necessarily valid","X-BeenThere":"linux-mtd@lists.infradead.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"Linux MTD discussion mailing list ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"ldv-project@linuxtesting.org, linux-oxnas@lists.tuxfamily.org,\n\tlinux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org,\n\tBrian Norris ,\n\tlinux-arm-kernel@lists.infradead.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Sender":"\"linux-mtd\" ","Errors-To":"linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org"}},{"id":1770124,"web_url":"http://patchwork.ozlabs.org/comment/1770124/","msgid":"<20170918142002.5aad038e@bbrezillon>","list_archive_url":null,"date":"2017-09-18T12:20:02","subject":"Re: [PATCH] mtd: oxnas_nand: Fix error handling in\n\toxnas_nand_probe()","submitter":{"id":63120,"url":"http://patchwork.ozlabs.org/api/people/63120/","name":"Boris Brezillon","email":"boris.brezillon@free-electrons.com"},"content":"On Mon, 18 Sep 2017 12:24:38 +0200\nNeil Armstrong wrote:\n\n> On 09/18/2017 12:14 PM, Boris Brezillon wrote:\n> > Hi Alexey,\n> > \n> > On Sat, 9 Sep 2017 01:00:38 +0300\n> > Alexey Khoroshilov wrote:\n> > \n> >> oxnas_nand_probe() does not disable clock on error paths.\n> >> The patch adds disabling using devm interface.\n> >>\n> >> Found by Linux Driver Verification project (linuxtesting.org).\n> >>\n> >> Signed-off-by: Alexey Khoroshilov \n> >> ---\n> >> drivers/mtd/nand/oxnas_nand.c | 22 +++++++++++++++-------\n> >> 1 file changed, 15 insertions(+), 7 deletions(-)\n> >>\n> >> diff --git a/drivers/mtd/nand/oxnas_nand.c b/drivers/mtd/nand/oxnas_nand.c\n> >> index 1b207aac840c..8abc69a285dd 100644\n> >> --- a/drivers/mtd/nand/oxnas_nand.c\n> >> +++ b/drivers/mtd/nand/oxnas_nand.c\n> >> @@ -103,16 +103,26 @@ static int oxnas_nand_probe(struct platform_device *pdev)\n> >> \tif (IS_ERR(oxnas->io_base))\n> >> \t\treturn PTR_ERR(oxnas->io_base);\n> >> \n> >> -\toxnas->clk = devm_clk_get(&pdev->dev, NULL);\n> >> -\tif (IS_ERR(oxnas->clk))\n> >> -\t\toxnas->clk = NULL;\n> >> -\n> >> \t/* Only a single chip node is supported */\n> >> \tcount = of_get_child_count(np);\n> >> \tif (count > 1)\n> >> \t\treturn -EINVAL;\n> >> \n> >> -\tclk_prepare_enable(oxnas->clk);\n> >> +\toxnas->clk = devm_clk_get(&pdev->dev, NULL);\n> >> +\tif (IS_ERR(oxnas->clk)) {\n> >> +\t\toxnas->clk = NULL;\n> >> +\t} else {\n> >> +\t\terr = clk_prepare_enable(oxnas->clk);\n> >> +\t\tif (err)\n> >> +\t\t\treturn err;\n> >> +\n> >> +\t\terr = devm_add_action_or_reset(&pdev->dev,\n> >> +\t\t\t\t(void(*)(void *))clk_disable_unprepare,\n> >> +\t\t\t\toxnas->clk);\n> >> +\t\tif (err)\n> >> +\t\t\treturn err;\n> >> +\t}\n> >> + \n> > \n> > Looks like something that should be made available at the CCF level\n> > either with a devm_clk_get_prepare_enable() or with a\n> > devm_clk_prepare_enable() helper. Would you care proposing this change\n> > to the CCF ML?\n> > \n> > In the meantime can you provide a simpler fix that just adds the\n> > missing clk_disable_unprepare() call in the error path?\n> > \n> >> \tdevice_reset_optional(&pdev->dev);\n> >> \n> >> \tfor_each_child_of_node(np, nand_np) {\n> >> @@ -167,8 +177,6 @@ static int oxnas_nand_remove(struct platform_device *pdev)\n> >> \tif (oxnas->chips[0])\n> >> \t\tnand_release(nand_to_mtd(oxnas->chips[0]));\n> >> \n> >> -\tclk_disable_unprepare(oxnas->clk);\n> >> -\n> >> \treturn 0;\n> >> }\n> >> \n> > \n> \n> Hi Boris,\n> \n> I would also like this to be simpler, but this is the actual way to workaround the lack of advanced devm_ calls from CCF.\n\nI did not realized that when I reviewed the patch this morning,\nbut the bug has already been fixed by 24c9cd8f8d26 (\"mtd: oxnas_nand:\nHandle clk_prepare_enable/clk_disable_unprepare.\"), which you acked.\n\n> \n> Is it an issue to keep this change ?\n\nWell, let's assume the patch was really fixing a bug. If it's\ntargeting an -rc or is meant to be backported, the patch should be as\nsimple as possible, which not the case here.\nAnother reason to keep the existing pattern is that, once you've added\nthe appropriate devm_ function to the CCF, you can automate the\nadoption of this function throughout the whole kernel tree using a\ncoccinelle script. If you start modifying some call-site that makes yet\nanother pattern to detect in the cocci script.","headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org; spf=none (mailfrom)\n\tsmtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133;\n\thelo=bombadil.infradead.org;\n\tenvelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org;\n\treceiver=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=lists.infradead.org\n\theader.i=@lists.infradead.org header.b=\"o3QhskaG\"; \n\tdkim-atps=neutral"],"Received":["from bombadil.infradead.org (bombadil.infradead.org\n\t[65.50.211.133])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xwlVG2bW0z9s78\n\tfor ;\n\tMon, 18 Sep 2017 22:21:26 +1000 (AEST)","from localhost ([127.0.0.1] helo=bombadil.infradead.org)\n\tby bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux))\n\tid 1dtv36-0005Km-BT; Mon, 18 Sep 2017 12:21:16 +0000","from mail.free-electrons.com ([62.4.15.54])\n\tby bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux))\n\tid 1dtv2G-0003ka-Gf; Mon, 18 Sep 2017 12:20:33 +0000","by mail.free-electrons.com (Postfix, from userid 110)\n\tid 684AA20E15; Mon, 18 Sep 2017 14:20:02 +0200 (CEST)","from bbrezillon (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr\n\t[90.63.216.87])\n\tby mail.free-electrons.com (Postfix) with ESMTPSA id 1FB4F20D6C;\n\tMon, 18 Sep 2017 14:20:02 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=lists.infradead.org; s=bombadil.20170209; h=Sender:\n\tContent-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post:\n\tList-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:\n\tMessage-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description:\n\tResent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:\n\tList-Owner; bh=AsD8ZOb4oEJptAYMYR0yoiVA2QTESBaAgQcyRCtPp4A=;\n\tb=o3QhskaG6EK56Z\n\t90zOKuXett5VajeiCTFb7GlRKGuV92f9CneIVPwMBX0KQgHygr3iBhI4kQXoUV4Y1tCNojn7AFQ6N\n\tVhMVk6J/muk/8HycRCq30duU+5vJ3/f9sh5VblpMaFq+XGMcnWRmuDpz154kOqPTIYdn1Du1WWqgF\n\tOUiWLnnzAuLDYZ0XZthxd29kuQonttL+UOA6Nrf6oKlJ2mCMWfQ7Das4R5b3PIsL/3Spv+MAlMxxb\n\tLJylz17B/4LvpqptKTS2rYcSv6cPIYdAMXCNJRvW5wkq9sfwkrJbxoteKKjKf+oH6owkjEw4dCB2m\n\tdijy2gigTpuKcKiFu3Zw==;","X-Spam-Checker-Version":"SpamAssassin 3.4.0 (2014-02-07) on\n\tmail.free-electrons.com","X-Spam-Level":"","X-Spam-Status":"No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT\n\tshortcircuit=ham autolearn=disabled version=3.4.0","Date":"Mon, 18 Sep 2017 14:20:02 +0200","From":"Boris Brezillon ","To":"Neil Armstrong ","Subject":"Re: [PATCH] mtd: oxnas_nand: Fix error handling in\n\toxnas_nand_probe()","Message-ID":"<20170918142002.5aad038e@bbrezillon>","In-Reply-To":"<87e7ab4e-d3fa-9207-c90c-c2c55b75aaed@baylibre.com>","References":"<1504908038-26285-1-git-send-email-khoroshilov@ispras.ru>\n\t<20170918121409.03e4b978@bbrezillon>\n\t<87e7ab4e-d3fa-9207-c90c-c2c55b75aaed@baylibre.com>","X-Mailer":"Claws Mail 3.14.1 (GTK+ 2.24.31; x86_64-pc-linux-gnu)","MIME-Version":"1.0","X-CRM114-Version":"20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 ","X-CRM114-CacheID":"sfid-20170918_052025_684196_EF024F52 ","X-CRM114-Status":"GOOD ( 27.27 )","X-Spam-Score":"-1.9 (-)","X-Spam-Report":"SpamAssassin version 3.4.1 on bombadil.infradead.org summary:\n\tContent analysis details: (-1.9 points)\n\tpts rule name description\n\t---- ----------------------\n\t--------------------------------------------------\n\t-0.0 SPF_PASS SPF: sender matches SPF record\n\t-0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay\n\tdomain\n\t-1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1%\n\t[score: 0.0000]","X-BeenThere":"linux-mtd@lists.infradead.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"Linux MTD discussion mailing list ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"ldv-project@linuxtesting.org, linux-oxnas@lists.tuxfamily.org,\n\tlinux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org,\n\tAlexey Khoroshilov ,\n\tBrian Norris ,\n\tlinux-arm-kernel@lists.infradead.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Sender":"\"linux-mtd\" ","Errors-To":"linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org"}}]