From patchwork Fri Dec 20 04:56:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 303877 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 B1B002C02A6 for ; Fri, 20 Dec 2013 15:57:36 +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 1Vts9S-0007vw-Qp; Fri, 20 Dec 2013 04:57:31 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vts9R-000716-8Q; Fri, 20 Dec 2013 04:57:29 +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 1Vts9O-00070F-8b for linux-mtd@lists.infradead.org; Fri, 20 Dec 2013 04:57:27 +0000 Received: from epcpsbgr4.samsung.com (u144.gpu120.samsung.co.kr [203.254.230.144]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MY300C2R9R2HB00@mailout2.samsung.com> for linux-mtd@lists.infradead.org; Fri, 20 Dec 2013 13:57:02 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.48]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id 56.A6.10364.A1EC3B25; Fri, 20 Dec 2013 13:56:58 +0900 (KST) X-AuditID: cbfee690-b7f266d00000287c-63-52b3ce1af524 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 45.FA.28157.A1EC3B25; Fri, 20 Dec 2013 13:56:58 +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 <0MY300ABL9QYXR20@mmp1.samsung.com>; Fri, 20 Dec 2013 13:56:58 +0900 (KST) From: Jingoo Han To: 'Brian Norris' References: <000f01cefd3f$60ef8540$22ce8fc0$%han@samsung.com> In-reply-to: <000f01cefd3f$60ef8540$22ce8fc0$%han@samsung.com> Subject: [PATCH 2/8] mtd: ixp4xx: Use devm_*() functions Date: Fri, 20 Dec 2013 13:56:58 +0900 Message-id: <001101cefd3f$e99a17c0$bcce4740$%han@samsung.com> MIME-version: 1.0 X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac79P2CnwVJoZjOVTtCwLCyw4gPPiAAACMcQ Content-language: ko x-cr-hashedpuzzle: B2nj D19o Ixv3 KfMr OzYr O06w Pvde UQP1 VLBl c9VH iWld mgUz sSYG tA/S vYhK 15X2; 5; YwBvAG0AcAB1AHQAZQByAHMAZgBvAHIAcABlAGEAYwBlAEAAZwBtAGEAaQBsAC4AYwBvAG0AOwBkAHcAbQB3ADIAQABpAG4AZgByAGEAZABlAGEAZAAuAG8AcgBnADsAagBnADEALgBoAGEAbgBAAHMAYQBtAHMAdQBuAGcALgBjAG8AbQA7AGwAaQBuAHUAeAAtAG0AdABkAEAAbABpAHMAdABzAC4AaQBuAGYAcgBhAGQAZQBhAGQALgBvAHIAZwA7AG0AawBsAEAAYgBsAGEAYwBrAHMAaABpAGYAdAAuAG8AcgBnAA==; Sosha1_v1; 7; {DD2E3CBE-F44C-4C4E-9312-85E1BE1812D2}; agBnADEALgBoAGEAbgBAAHMAYQBtAHMAdQBuAGcALgBjAG8AbQA=; Fri, 20 Dec 2013 04:56:50 GMT; WwBQAEEAVABDAEgAIAAyAC8AOABdACAAbQB0AGQAOgAgAGkAeABwADQAeAB4ADoAIABVAHMAZQAgAGQAZQB2AG0AXwAqACgAKQAgAGYAdQBuAGMAdABpAG8AbgBzAA== x-cr-puzzleid: {DD2E3CBE-F44C-4C4E-9312-85E1BE1812D2} X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrDIsWRmVeSWpSXmKPExsVy+t8zA12pc5uDDPYuULc4cmEts8XElZOZ LS4vvMRqsbtpGbvF6vXrmBxYPR63nGX02DnrLrvH5hVaHpuX1Hv0bVnFGMAaxWWTkpqTWZZa pG+XwJXxapdCwVy+isez5rA2MN7m7mLk5JAQMJGYMO8ZG4QtJnHh3nogm4tDSGAZo0T/6qus MEVLLzUzQSQWMUo0fFwK5fxilJhy5TVYFZuAmsSXL4fZuxg5OEQEDCR+vMkECTMLzGKU2Nds AxIWErCVeH4lGyTMKWAnMfHVDRYQW1jAQuLSkXfsIDaLgKpE95t5YAfxApWv+PiGEcIWlPgx +R4LxEgtifU7jzNB2PISm9e8ZQYZLyGgLvHory5IWETASOLCmrXsECUiEvtevGOEeGUNq8Tu 6wYQtqnEt9+72EE+kRD4yi6xr+MME8QNAhLfJh9igZgpK7HpADNEvaTEwRU3WCYwSs1CctEs JBfNQnLRLCSrFzCyrGIUTS1ILihOSi8y0StOzC0uzUvXS87P3cQIiekJOxjvHbA+xJgMtH4i s5Rocj4wJeSVxBsamxlZmJqYGhuZW5qRJqwkzqv2KClISCA9sSQ1OzW1ILUovqg0J7X4ECMT B6dUA2P7bebtUz9duKWfKyXwsjVYRejMdom2P78j7zbm6sW9iJ5RmJA111+zhN0t0iLbecF8 m875+aGTGGRefO24t+GASKV9QOwmVyWNdqaV6zW8BSVdBIsKntx79bhrl2a8TdbU2xPkhNe9 Ojb90pqWoyym+n8nWy3M1Hc0f9do+7hbc9OZ3zsKPymxFGckGmoxFxUnAgDITlDr/wIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrJKsWRmVeSWpSXmKPExsVy+t9jAV2pc5uDDG4tVrY4cmEts8XElZOZ LS4vvMRqsbtpGbvF6vXrmBxYPR63nGX02DnrLrvH5hVaHpuX1Hv0bVnFGMAa1cBok5GamJJa pJCal5yfkpmXbqvkHRzvHG9qZmCoa2hpYa6kkJeYm2qr5OIToOuWmQO0XEmhLDGnFCgUkFhc rKRvh2lCaIibrgVMY4Sub0gQXI+RARpIWMeY8WqXQsFcvorHs+awNjDe5u5i5OSQEDCRWHqp mQnCFpO4cG89WxcjF4eQwCJGiYaPS5kgnF+MElOuvGYFqWITUJP48uUwexcjB4eIgIHEjzeZ IGFmgVmMEvuabUDCQgK2Es+vZIOEOQXsJCa+usECYgsLWEhcOvKOHcRmEVCV6H4zjw3E5gUq X/HxDSOELSjxY/I9FoiRWhLrdx5ngrDlJTavecsMMl5CQF3i0V9dkLCIgJHEhTVr2SFKRCT2 vXjHCPHKGlaJ3dcNIGxTiW+/d7FPYBSZhWTDLCQbZiHZMAvJqAWMLKsYRVMLkguKk9JzjfSK E3OLS/PS9ZLzczcxghPGM+kdjKsaLA4xCnAwKvHwFuhvDhJiTSwrrsw9xCjBwawkwht/ECjE m5JYWZValB9fVJqTWnyIMRkYABOZpUST84HJLK8k3tDYxMzI0sjMwsjE3Jw0YSVx3oOt1oFC AumJJanZqakFqUUwW5g4OKUaGLXljCZd75h35XHYfXXDW2aK87tkdvhxLIm+faQ1ffk8lSvL NmXJ3TRk3aRe/+6dVpC/zo/X/IH9lx9e777dybwqc6qd8scbz+7bmp4PMzaqm7k1yef/wpTD d/ek/PBLfsfffXlrSiNH1S4G4d9s/tK/Dr8rPyIyP+F57llpeZObSnH1G7wslJRYijMSDbWY i4oTASMYe1JcAwAA 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-20131219_235726_559881_8E098FD0 X-CRM114-Status: UNSURE ( 8.57 ) 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.25 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] Cc: linux-mtd@lists.infradead.org, 'Jingoo Han' , 'David Woodhouse' , 'Marc Kleine-Budde' 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 --- drivers/mtd/maps/ixp4xx.c | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/drivers/mtd/maps/ixp4xx.c b/drivers/mtd/maps/ixp4xx.c index 10debfe..5f42916 100644 --- a/drivers/mtd/maps/ixp4xx.c +++ b/drivers/mtd/maps/ixp4xx.c @@ -162,13 +162,6 @@ static int ixp4xx_flash_remove(struct platform_device *dev) mtd_device_unregister(info->mtd); map_destroy(info->mtd); } - if (info->map.virt) - iounmap(info->map.virt); - - if (info->res) { - release_resource(info->res); - kfree(info->res); - } if (plat->exit) plat->exit(); @@ -194,7 +187,8 @@ static int ixp4xx_flash_probe(struct platform_device *dev) return err; } - info = kzalloc(sizeof(struct ixp4xx_flash_info), GFP_KERNEL); + info = devm_kzalloc(&dev->dev, sizeof(struct ixp4xx_flash_info), + GFP_KERNEL); if(!info) { err = -ENOMEM; goto Error; @@ -220,20 +214,9 @@ static int ixp4xx_flash_probe(struct platform_device *dev) info->map.write = ixp4xx_probe_write16; info->map.copy_from = ixp4xx_copy_from; - info->res = request_mem_region(dev->resource->start, - resource_size(dev->resource), - "IXP4XXFlash"); - if (!info->res) { - printk(KERN_ERR "IXP4XXFlash: Could not reserve memory region\n"); - err = -ENOMEM; - goto Error; - } - - info->map.virt = ioremap(dev->resource->start, - resource_size(dev->resource)); - if (!info->map.virt) { - printk(KERN_ERR "IXP4XXFlash: Failed to ioremap region\n"); - err = -EIO; + info->map.virt = devm_ioremap_resource(&dev->dev, dev->resource); + if (IS_ERR(info->map.virt)) { + err = PTR_ERR(info->map.virt); goto Error; }