From patchwork Thu Dec 26 01:41:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 305151 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 73B232C009C for ; Thu, 26 Dec 2013 12:42:20 +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 1Vvzxn-00077I-BC; Thu, 26 Dec 2013 01:42:15 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vvzxl-0002AS-Ph; Thu, 26 Dec 2013 01:42:13 +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 1Vvzxj-00029R-0y for linux-mtd@lists.infradead.org; Thu, 26 Dec 2013 01:42:11 +0000 Received: from epcpsbgr2.samsung.com (u142.gpu120.samsung.co.kr [203.254.230.142]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MYE00A924PPIGC0@mailout3.samsung.com> for linux-mtd@lists.infradead.org; Thu, 26 Dec 2013 10:41:49 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.50]) by epcpsbgr2.samsung.com (EPCPMTA) with SMTP id BF.F2.09028.B598BB25; Thu, 26 Dec 2013 10:41:47 +0900 (KST) X-AuditID: cbfee68e-b7f566d000002344-4c-52bb895b8566 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 84.3B.29263.B598BB25; Thu, 26 Dec 2013 10:41:47 +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 <0MYE00F694PN8R90@mmp2.samsung.com>; Thu, 26 Dec 2013 10:41:47 +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 2/8] mtd: ixp4xx: Use devm_*() functions Date: Thu, 26 Dec 2013 10:41:47 +0900 Message-id: <007a01cf01db$a3db7d50$eb9277f0$%han@samsung.com> MIME-version: 1.0 X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac8B24NMnmT2jqUVQHWbCuObShK78AAAA9hw Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrMIsWRmVeSWpSXmKPExsVy+t8zI93ozt1BBgdOmlgcubCW2WLiysnM FpcXXmK12N20jN1i9fp1TA6sHo9bzjJ67Jx1l91j8wotj81L6j36tqxiDGCN4rJJSc3JLEst 0rdL4Mp48/kjY8EWvor5a+YzNjC+5u5i5OSQEDCRuHVqESOELSZx4d56ti5GLg4hgWWMEo+f 32KGKXq9eykTRGI6o8TajydZIJxfjBIL1y8Bq2ITUJP48uUwexcjB4eIgIHEjzeZIGFmgVmM EvuabUBsIQFbiU/rN7KC2JwCdhIXmr6ClQsLWEssWKUOYrIIqErc2ccDYvICVR/brg5SzCsg KPFj8j0WiIFaEut3HmeCsOUlNq95ywxSLiGgLvHory5IWETASOL821usECUiEvtevGMEuVdC 4Ba7xPfpD8HmsAgISHybfIgFoldWYtMBqGclJQ6uuMEygVFiFpLNs5BsnoVk8ywkKxYwsqxi FE0tSC4oTkovMtIrTswtLs1L10vOz93ECInQvh2MNw9YH2JMBlo/kVlKNDkfGOF5JfGGxmZG FqYmpsZG5pZmpAkrifMuepgUJCSQnliSmp2aWpBaFF9UmpNafIiRiYNTqoGRecIfSenNj7vU Yh0KfoZYnFAUmvvsWYOF0+wV1s7SK6JNLSdsXsj8+FzD1X6nk4YL8hfMSfqg02K5w5lZ74LZ NEW1j169c3JvliTtNVi/uahAu2aR9C2loicRlzYwXz5R8qqaw9A2QNdhX6xLPb+b5xq7rTWv L5zOKts4/02pM+uOo6s8/pcrsRRnJBpqMRcVJwIApwjRcOYCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrAKsWRmVeSWpSXmKPExsVy+t9jQd3ozt1BBt+PG1gcubCW2WLiysnM FpcXXmK12N20jN1i9fp1TA6sHo9bzjJ67Jx1l91j8wotj81L6j36tqxiDGCNamC0yUhNTEkt UkjNS85PycxLt1XyDo53jjc1MzDUNbS0MFdSyEvMTbVVcvEJ0HXLzAFarqRQlphTChQKSCwu VtK3wzQhNMRN1wKmMULXNyQIrsfIAA0krGPMePP5I2PBFr6K+WvmMzYwvubuYuTkkBAwkXi9 eykThC0mceHeerYuRi4OIYHpjBJrP55kgXB+MUosXL+EGaSKTUBN4suXw+xdjBwcIgIGEj/e ZIKEmQVmMUrsa7YBsYUEbCU+rd/ICmJzCthJXGj6ClYuLGAtsWCVOojJIqAqcWcfD4jJC1R9 bLs6SDGvgKDEj8n3WCAGakms33mcCcKWl9i85i0zSLmEgLrEo7+6IGERASOJ829vsUKUiEjs e/GOcQKj0Cwkk2YhmTQLyaRZSFoWMLKsYhRNLUguKE5KzzXUK07MLS7NS9dLzs/dxAiO/2dS OxhXNlgcYhTgYFTi4e3Q3R0kxJpYVlyZe4hRgoNZSYQ3sAkoxJuSWFmVWpQfX1Sak1p8iDEZ 6M2JzFKiyfnA1JRXEm9obGJmZGlkZmFkYm5OmrCSOO+BVutAIYH0xJLU7NTUgtQimC1MHJxS DYzer3zVDBfV3XPfez9vttC2jvlJjR/k9dh+eZxhN7kiyF4rd/5T34/gnyUVj/Nl8xjLX72t v+3n9mHZx8e/zmZ5se7RuNu0j5Np+9KE6pycmXdmKxncv8I0/bOAKfvqn/+12HX43vtqfbyu HHUpLl/dWaKxs7tTsZytdNFjZz/v4+HbbRWatZVYijMSDbWYi4oTAbM3i+BDAwAA 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_204211_313526_4BB71188 X-CRM114-Status: UNSURE ( 8.51 ) 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.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] 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 --- No change since v2. 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; }