From patchwork Fri Dec 20 07:31:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 303922 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 A7D262C020A for ; Fri, 20 Dec 2013 18:32:06 +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 1VtuYu-000621-Da; Fri, 20 Dec 2013 07:31:56 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VtuYs-0000vl-SM; Fri, 20 Dec 2013 07:31:54 +0000 Received: from mailout1.samsung.com ([203.254.224.24]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VtuYo-0000ut-VX for linux-mtd@lists.infradead.org; Fri, 20 Dec 2013 07:31:52 +0000 Received: from epcpsbgr2.samsung.com (u142.gpu120.samsung.co.kr [203.254.230.142]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MY300B50GWF52E0@mailout1.samsung.com> for linux-mtd@lists.infradead.org; Fri, 20 Dec 2013 16:31:27 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.50]) by epcpsbgr2.samsung.com (EPCPMTA) with SMTP id 32.BA.09028.F42F3B25; Fri, 20 Dec 2013 16:31:27 +0900 (KST) X-AuditID: cbfee68e-b7f566d000002344-60-52b3f24fb16b Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id F8.D7.29263.F42F3B25; Fri, 20 Dec 2013 16:31:27 +0900 (KST) Received: from DOJG1HAN03 ([12.23.120.99]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MY300GXCGWFFX70@mmp1.samsung.com>; Fri, 20 Dec 2013 16:31:27 +0900 (KST) From: Jingoo Han To: 'Brian Norris' Subject: [PATCH V2 1/8] mtd: docg3: Use devm_*() functions Date: Fri, 20 Dec 2013 16:31:27 +0900 Message-id: <000d01cefd55$7e48a2a0$7ad9e7e0$%han@samsung.com> MIME-version: 1.0 X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac79VX4zfOEDhlMqR4WYmWacubn25Q== Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrDIsWRmVeSWpSXmKPExsVy+t8zI13/T5uDDK7clbE4cmEts8XElZOZ LS4vvMRqsbtpGbvFrDfCDqwe/es+s3rsnHWX3WPzCi2PzUvqPfq2rGIMYI3isklJzcksSy3S t0vgyjiw/jBLwXWBil+HtBoYT/J2MXJySAiYSPz9eoUdwhaTuHBvPVsXIxeHkMAyRokF53ey wRT9n9fEBJFYxCjx8ksTC4Tzi1Fi6sQJTCBVbAJqEl++HAYaxcEhImAg8eNNJkgNs8BsRold v7aD1QgLWEls3/SGFcRmEVCV6Dv8lhHE5hWwlfh3ajE7hC0o8WPyPRYQm1lAS2L9zuNMELa8 xOY1b5lB5ksIqEs8+qsLEhYR0JNoOviSHaJERGLfi3eMEEcfYpeYfqIKYpWAxLfJh1ggWmUl Nh1ghiiRlDi44gbLBEaxWUgWz0KyeBaSxbOQbFjAyLKKUTS1ILmgOCm9yEivODG3uDQvXS85 P3cTIyTm+nYw3jxgfYgxGWj9RGYp0eR8YMzmlcQbGpsZWZiamBobmVuakSasJM676GFSkJBA emJJanZqakFqUXxRaU5q8SFGJg5OqQZGteyafc13lvHWFrUkRZqUZfw4tJH1x58XlXV7K+vr opSrYt+fVpnsUbd+VS93l5rCWcbq+TOm3F46gbPq87ttGyvWCeh/eXl/4iQex8fpmQlvDx6b Uq2j/MA/8l7XgUoXlTc5Tyd8Eew57vCVv0bUqN5HQvGs/ZU9O7qVIg8JbGPgVKhw1xNQYinO SDTUYi4qTgQA5b2I4c8CAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprFKsWRmVeSWpSXmKPExsVy+t9jAV3/T5uDDI5dkrA4cmEts8XElZOZ LS4vvMRqsbtpGbvFrDfCDqwe/es+s3rsnHWX3WPzCi2PzUvqPfq2rGIMYI1qYLTJSE1MSS1S SM1Lzk/JzEu3VfIOjneONzUzMNQ1tLQwV1LIS8xNtVVy8QnQdcvMAdqtpFCWmFMKFApILC5W 0rfDNCE0xE3XAqYxQtc3JAiux8gADSSsY8w4sP4wS8F1gYpfh7QaGE/ydjFyckgImEj8n9fE BGGLSVy4t56ti5GLQ0hgEaPEyy9NLBDOL0aJqRMngFWxCahJfPlymL2LkYNDRMBA4sebTJAa ZoHZjBK7fm0HqxEWsJLYvukNK4jNIqAq0Xf4LSOIzStgK/Hv1GJ2CFtQ4sfkeywgNrOAlsT6 nceZIGx5ic1r3jKDzJcQUJd49FcXJCwioCfRdPAlO0SJiMS+F+8YJzAKzEIyaRaSSbOQTJqF pGUBI8sqRtHUguSC4qT0XEO94sTc4tK8dL3k/NxNjOCYfia1g3Flg8UhRgEORiUe3gbbzUFC rIllxZW5hxglOJiVRHg5ngOFeFMSK6tSi/Lji0pzUosPMSYDPTqRWUo0OR+YbvJK4g2NTcyM LI3MLIxMzM1JE1YS5z3Qah0oJJCeWJKanZpakFoEs4WJg1OqgdFfK+FDreHDwF7Rf5Kdl806 Ga48VExmqo/syjRiSljIOjVpb8pl1vCjK9dbiss8SuCqNZF9kXV8r2LZKe3sad0P/n5s2qVm s/p4zxP/22FXWoNlIucuWlEyeRbLHPnYKWXtx3LWnHK4kvu7+0JG6hGOoKPxBlrLYyK5DWTf LHT/FGf07qZolhJLcUaioRZzUXEiAEH4qNItAwAA 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-20131220_023151_277031_F90198EF X-CRM114-Status: UNSURE ( 8.00 ) 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.24 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.5 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 v1. 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; }