From patchwork Thu Dec 26 01:44:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 305154 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from casper.infradead.org (unknown [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id B2B7D2C008F for ; Thu, 26 Dec 2013 12:45:08 +1100 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vw00U-0007mY-VH; Thu, 26 Dec 2013 01:45:03 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vw00T-0002H4-3i; Thu, 26 Dec 2013 01:45:01 +0000 Received: from mailout2.samsung.com ([203.254.224.25]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vw00R-0002Fr-2z for linux-mtd@lists.infradead.org; Thu, 26 Dec 2013 01:44:59 +0000 Received: from epcpsbgr2.samsung.com (u142.gpu120.samsung.co.kr [203.254.230.142]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MYE00FVI4U78TC0@mailout2.samsung.com> for linux-mtd@lists.infradead.org; Thu, 26 Dec 2013 10:44:31 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.49]) by epcpsbgr2.samsung.com (EPCPMTA) with SMTP id 8A.74.09028.FF98BB25; Thu, 26 Dec 2013 10:44:31 +0900 (KST) X-AuditID: cbfee68e-b7f566d000002344-18-52bb89ff825f Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 66.9B.29263.FF98BB25; Thu, 26 Dec 2013 10:44:31 +0900 (KST) Received: from DOJG1HAN03 ([12.23.120.99]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MYE00FPZ4U68E80@mmp2.samsung.com>; Thu, 26 Dec 2013 10:44:30 +0900 (KST) From: Jingoo Han To: 'Brian Norris' References: <007901cf01db$8362f580$8a28e080$%han@samsung.com> In-reply-to: <007901cf01db$8362f580$8a28e080$%han@samsung.com> Subject: [PATCH V3 5/8] mtd: lpc32xx_slc: Use devm_*() functions Date: Thu, 26 Dec 2013 10:44:30 +0900 Message-id: <007d01cf01dc$052cd1d0$0f867570$%han@samsung.com> MIME-version: 1.0 X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac8B24NMnmT2jqUVQHWbCuObShK78AAAE7WQ Content-language: ko x-cr-hashedpuzzle: Cz4f FVN/ GznQ IDQU QOwE Qjtw ZLFq bI+y fcg0 iz0h i4Hu mAhp o40q ptop vm0B v2zm; 5; YwBvAG0AcAB1AHQAZQByAHMAZgBvAHIAcABlAGEAYwBlAEAAZwBtAGEAaQBsAC4AYwBvAG0AOwBkAHcAbQB3ADIAQABpAG4AZgByAGEAZABlAGEAZAAuAG8AcgBnADsAagBnADEALgBoAGEAbgBAAHMAYQBtAHMAdQBuAGcALgBjAG8AbQA7AGwAaQBuAHUAeAAtAG0AdABkAEAAbABpAHMAdABzAC4AaQBuAGYAcgBhAGQAZQBhAGQALgBvAHIAZwA7AHMAdABpAGcAZwBlAEAAYQBuAHQAYwBvAG0ALgBkAGUA; Sosha1_v1; 7; {2A6F25D2-E839-4967-9935-6DF8E61D51F2}; agBnADEALgBoAGEAbgBAAHMAYQBtAHMAdQBuAGcALgBjAG8AbQA=; Thu, 26 Dec 2013 01:44:23 GMT; WwBQAEEAVABDAEgAIABWADMAIAA1AC8AOABdACAAbQB0AGQAOgAgAGwAcABjADMAMgB4AHgAXwBzAGwAYwA6ACAAVQBzAGUAIABkAGUAdgBtAF8AKgAoACkAIABmAHUAbgBjAHQAaQBvAG4AcwA= x-cr-puzzleid: {2A6F25D2-E839-4967-9935-6DF8E61D51F2} X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrAIsWRmVeSWpSXmKPExsVy+t8zQ93/nbuDDA4d57Y4cmEts8XElZOZ LS4vvMRqsbtpGbvF5CVnWR1YPeZM3c3osXPWXXaPzSu0PDYvqffo27KKMYA1issmJTUnsyy1 SN8ugSvj+Z8ZrAWLeCvWdRxkbmBs5+5i5OSQEDCR2LfnDxuELSZx4d56IJuLQ0hgGaPEtZeL GGGKenrbGSES0xklziy9xwLh/GKUmLF8MjtIFZuAmsSXL4eBbA4OEQEDiR9vMkFqmAWmMEps uLYIrEZIwFbi0/qNrCA2p4CdxIWmr2BxYQEHiYMdk1lAbBYBVYnei81gcV6g+htND9kgbEGJ H5PvgdUwC2hJrN95nAnClpfYvOYtM8heCQF1iUd/dUHCIgJGEvv3f2CGKBGR2PfiHdgDEgI7 WCX+TtjECvGZqcTP1buYIRJ/2SVWLbsMdYSAxLfJh1gghspKbDrADFEvKXFwxQ2WCYxSs5Cc NAvJSbOQnDQLye4FjCyrGEVTC5ILipPSi4z0ihNzi0vz0vWS83M3MUJiu28H480D1ocYk4HW T2SWEk3OB6aGvJJ4Q2MzIwtTE1NjI3NLM9KElcR5Fz1MChISSE8sSc1OTS1ILYovKs1JLT7E yMTBKdXAOMc1ct3i8snSnbuWerxOPRGxUXjl9XuTD5z79r5QJ7dTqNr8e41EcN7DnbFXaxes XL/wu8tO/bywe0tbJ+VWGzMfvNWw8u3h7bpSTrttQ5pzuY8tXC+4ftXkS8uTj896d3XNHL+F B9YafdGWe7jf6XPq5Kl9P+rPetcErthQ1iup6Hhz40SrcxOVWIozEg21mIuKEwGrzNrVAwMA AA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrLKsWRmVeSWpSXmKPExsVy+t9jQd3/nbuDDG5cYbc4cmEts8XElZOZ LS4vvMRqsbtpGbvF5CVnWR1YPeZM3c3osXPWXXaPzSu0PDYvqffo27KKMYA1qoHRJiM1MSW1 SCE1Lzk/JTMv3VbJOzjeOd7UzMBQ19DSwlxJIS8xN9VWycUnQNctMwdouZJCWWJOKVAoILG4 WEnfDtOE0BA3XQuYxghd35AguB4jAzSQsI4x4/mfGawFi3gr1nUcZG5gbOfuYuTkkBAwkejp bWeEsMUkLtxbz9bFyMUhJDCdUeLM0nssEM4vRokZyyezg1SxCahJfPlyGMjm4BARMJD48SYT pIZZYAqjxIZri8BqhARsJT6t38gKYnMK2ElcaPoKFhcWcJA42DGZBcRmEVCV6L3YDBbnBaq/ 0fSQDcIWlPgx+R5YDbOAlsT6nceZIGx5ic1r3jKD7JUQUJd49FcXJCwiYCSxf/8HZogSEYl9 L94xgtwjIbCDVeLvhE2sEJ+ZSvxcvYt5AqPILCQrZiFZMQvJillIZi1gZFnFKJpakFxQnJSe a6hXnJhbXJqXrpecn7uJEZw4nkntYFzZYHGIUYCDUYmHt0N3d5AQa2JZcWXuIUYJDmYlEd7A JqAQb0piZVVqUX58UWlOavEhxmRgCExklhJNzgcmtbySeENjEzMjSyMzCyMTc3PShJXEeQ+0 WgcKCaQnlqRmp6YWpBbBbGHi4JRqYJx1TojV//STyCl3dT63rp2yRPZSebjo5ffbD/6u37pn vZHM13XVcQ+0LCPaVFP/2pxP/DX1+bLb3hkGXtoTe3Z8aJn34OXRpWn27msbtU9eZ5onX/fX ueMx64SN1s7x718vrH/wPax81eRFWs79S6/JGkYfXO9ZxrvkW9z2fS8P8O7pEkv5pXhbiaU4 I9FQi7moOBEA1EHHnWADAAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131225_204459_352093_194334D1 X-CRM114-Status: UNSURE ( 7.75 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -7.5 (-------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-7.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [203.254.224.25 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.6 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: 'Roland Stigge' , linux-mtd@lists.infradead.org, 'Jingoo Han' , 'David Woodhouse' X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Use devm_*() functions to make cleanup paths simpler. Signed-off-by: Jingoo Han Acked-by: Roland Stigge --- No change since v2. drivers/mtd/nand/lpc32xx_slc.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/mtd/nand/lpc32xx_slc.c b/drivers/mtd/nand/lpc32xx_slc.c index 23e6974..5f20394 100644 --- a/drivers/mtd/nand/lpc32xx_slc.c +++ b/drivers/mtd/nand/lpc32xx_slc.c @@ -791,8 +791,8 @@ static int lpc32xx_nand_probe(struct platform_device *pdev) } if (host->ncfg->wp_gpio == -EPROBE_DEFER) return -EPROBE_DEFER; - if (gpio_is_valid(host->ncfg->wp_gpio) && - gpio_request(host->ncfg->wp_gpio, "NAND WP")) { + if (gpio_is_valid(host->ncfg->wp_gpio) && devm_gpio_request(&pdev->dev, + host->ncfg->wp_gpio, "NAND WP")) { dev_err(&pdev->dev, "GPIO not available\n"); return -EBUSY; } @@ -808,7 +808,7 @@ static int lpc32xx_nand_probe(struct platform_device *pdev) mtd->dev.parent = &pdev->dev; /* Get NAND clock */ - host->clk = clk_get(&pdev->dev, NULL); + host->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(host->clk)) { dev_err(&pdev->dev, "Clock failure\n"); res = -ENOENT; @@ -927,10 +927,8 @@ err_exit3: dma_release_channel(host->dma_chan); err_exit2: clk_disable(host->clk); - clk_put(host->clk); err_exit1: lpc32xx_wp_enable(host); - gpio_free(host->ncfg->wp_gpio); return res; } @@ -953,9 +951,7 @@ static int lpc32xx_nand_remove(struct platform_device *pdev) writel(tmp, SLC_CTRL(host->io_base)); clk_disable(host->clk); - clk_put(host->clk); lpc32xx_wp_enable(host); - gpio_free(host->ncfg->wp_gpio); return 0; }