From patchwork Thu Dec 26 01:40:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 305150 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 9A56E2C008F for ; Thu, 26 Dec 2013 12:41:35 +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 1Vvzwx-0006ud-66; Thu, 26 Dec 2013 01:41:23 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vvzwv-00028t-Hm; Thu, 26 Dec 2013 01:41:21 +0000 Received: from mailout3.samsung.com ([203.254.224.33]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vvzws-00028J-Ag for linux-mtd@lists.infradead.org; Thu, 26 Dec 2013 01:41:20 +0000 Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MYE00COO4O5FSA0@mailout3.samsung.com> for linux-mtd@lists.infradead.org; Thu, 26 Dec 2013 10:40:53 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.51]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id 35.86.14803.5298BB25; Thu, 26 Dec 2013 10:40:53 +0900 (KST) X-AuditID: cbfee691-b7efc6d0000039d3-7a-52bb8925cc92 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 89.B7.28157.5298BB25; Thu, 26 Dec 2013 10:40:53 +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 <0MYE00FW94O58R80@mmp2.samsung.com>; Thu, 26 Dec 2013 10:40:53 +0900 (KST) From: Jingoo Han To: 'Brian Norris' Subject: [PATCH V3 1/8] mtd: docg3: Use devm_*() functions Date: Thu, 26 Dec 2013 10:40:52 +0900 Message-id: <007901cf01db$8362f580$8a28e080$%han@samsung.com> MIME-version: 1.0 X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac8B24NMnmT2jqUVQHWbCuObShK78A== Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrLIsWRmVeSWpSXmKPExsVy+t8zY13Vzt1BBv9fCVscubCW2WLiysnM FpcXXmK12N20jN1i1hthB1aP/nWfWT12zrrL7rF5hZbH5iX1Hn1bVjEGsEZx2aSk5mSWpRbp 2yVwZfxevIel4LpARePhX8wNjCd5uxg5OSQETCS6l6xjhbDFJC7cW8/WxcjFISSwjFHi4fYn TDBFT45dYoVITGeUWPmjHarqF6PEls5NbCBVbAJqEl++HGbvYuTgEBEwkPjxJhOkhllgNqPE rl/bwSYJC1hJXNl3HayeRUBV4sqs1awg9bwCthK7zuuDhHkFBCV+TL7HAmIzC2hJrN95nAnC lpfYvOYtM0i5hIC6xKO/uiBhEQE9iW99u6FKRCT2vXjHCLJWQuAYu8ShaSeZIVYJSHybfIgF oldWYtMBZoi/JCUOrrjBMoFRbBaSzbOQbJ6FZPMsJCsWMLKsYhRNLUguKE5KLzLVK07MLS7N S9dLzs/dxAiJuok7GO8fsD7EmAy0fiKzlGhyPjBq80riDY3NjCxMTUyNjcwtzUgTVhLnTX+U FCQkkJ5YkpqdmlqQWhRfVJqTWnyIkYmDU6qBscpjvTj7p81p2jl/vLkrfaNXNW4r2L/u44Qr Bdc2fNTZujhP30jj5YWf8h0/bxllW8XcEhDirzb9tXp5Y+qU9cnzqq5onz+svm7/id89ZR+F RN1+ZPNcn/FCzinusNiz86IvJ7yVjmf/PrnoRs7dpzavL77mNXglMk0tUuPcS0aJ4xc+xz2L Pq3EUpyRaKjFXFScCAAj9CdR0AIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprFKsWRmVeSWpSXmKPExsVy+t9jQV3Vzt1BBv/O8VscubCW2WLiysnM FpcXXmK12N20jN1i1hthB1aP/nWfWT12zrrL7rF5hZbH5iX1Hn1bVjEGsEY1MNpkpCampBYp pOYl56dk5qXbKnkHxzvHm5oZGOoaWlqYKynkJeam2iq5+AToumXmAO1WUihLzCkFCgUkFhcr 6dthmhAa4qZrAdMYoesbEgTXY2SABhLWMWb8XryHpeC6QEXj4V/MDYwnebsYOTkkBEwknhy7 xAphi0lcuLeerYuRi0NIYDqjxMof7VDOL0aJLZ2b2ECq2ATUJL58OczexcjBISJgIPHjTSZI DbPAbEaJXb+2M4HUCAtYSVzZdx2snkVAVeLKrNWsIPW8ArYSu87rg4R5BQQlfky+xwJiMwto SazfeZwJwpaX2LzmLTNIuYSAusSjv7ogYREBPYlvfbuhSkQk9r14xziBUWAWkkmzkEyahWTS LCQtCxhZVjGKphYkFxQnpeca6RUn5haX5qXrJefnbmIEx/Qz6R2MqxosDjEKcDAq8fB26O4O EmJNLCuuzD3EKMHBrCTCG9gEFOJNSaysSi3Kjy8qzUktPsSYDPTnRGYp0eR8YLrJK4k3NDYx M7I0MrMwMjE3J01YSZz3YKt1oJBAemJJanZqakFqEcwWJg5OqQbGOsVl+a9/Sxxn5LJnzHe/ LfYgmPG883pNjuzjh71/WBx/6hOumbyhPGuntONhLdfLsybPZ4v6KN6z7txzzRWcLqJnpm30 1HFSVrrBtu/F6ryG5KVbyhqWqwQKV0Qz7uh48Up9Yl6kmnBxsRuPQezcL47pYam/E72fq38o VP/8LLjrROV2yUVKLMUZiYZazEXFiQAa+G8mLQMAAA== 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_204118_646164_82EF1DD6 X-CRM114-Status: UNSURE ( 7.95 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -7.4 (-------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-7.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [203.254.224.33 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] 0.0 T_HDRS_LCASE Odd capitalization of message header 0.0 T_MANY_HDRS_LCASE Odd capitalization of multiple message headers Cc: linux-mtd@lists.infradead.org, 'Robert Jarzmik' , '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 --- No change since v2. drivers/mtd/devices/docg3.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/drivers/mtd/devices/docg3.c b/drivers/mtd/devices/docg3.c index 4f091c1..dd5e101 100644 --- a/drivers/mtd/devices/docg3.c +++ b/drivers/mtd/devices/docg3.c @@ -2047,21 +2047,21 @@ static int __init docg3_probe(struct platform_device *pdev) ress = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!ress) { dev_err(dev, "No I/O memory resource defined\n"); - goto noress; + return ret; } - base = ioremap(ress->start, DOC_IOSPACE_SIZE); + base = devm_ioremap(dev, ress->start, DOC_IOSPACE_SIZE); ret = -ENOMEM; - cascade = kzalloc(sizeof(*cascade) * DOC_MAX_NBFLOORS, - GFP_KERNEL); + cascade = devm_kzalloc(dev, sizeof(*cascade) * DOC_MAX_NBFLOORS, + GFP_KERNEL); if (!cascade) - goto nomem1; + return ret; cascade->base = base; mutex_init(&cascade->lock); cascade->bch = init_bch(DOC_ECC_BCH_M, DOC_ECC_BCH_T, DOC_ECC_BCH_PRIMPOLY); if (!cascade->bch) - goto nomem2; + return ret; for (floor = 0; floor < DOC_MAX_NBFLOORS; floor++) { mtd = doc_probe_device(cascade, floor, dev); @@ -2101,11 +2101,6 @@ err_probe: for (floor = 0; floor < DOC_MAX_NBFLOORS; floor++) if (cascade->floors[floor]) doc_release_device(cascade->floors[floor]); -nomem2: - kfree(cascade); -nomem1: - iounmap(base); -noress: return ret; } @@ -2119,7 +2114,6 @@ static int __exit docg3_release(struct platform_device *pdev) { struct docg3_cascade *cascade = platform_get_drvdata(pdev); struct docg3 *docg3 = cascade->floors[0]->priv; - void __iomem *base = cascade->base; int floor; doc_unregister_sysfs(pdev, cascade); @@ -2129,8 +2123,6 @@ static int __exit docg3_release(struct platform_device *pdev) doc_release_device(cascade->floors[floor]); free_bch(docg3->cascade->bch); - kfree(cascade); - iounmap(base); return 0; }