From patchwork Tue Dec 17 06:50:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 302004 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 60CE92C00A4 for ; Tue, 17 Dec 2013 17:50:38 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752074Ab3LQGuh (ORCPT ); Tue, 17 Dec 2013 01:50:37 -0500 Received: from mailout4.samsung.com ([203.254.224.34]:16357 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751867Ab3LQGug (ORCPT ); Tue, 17 Dec 2013 01:50:36 -0500 Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MXX00ECJV0ABKA0@mailout4.samsung.com> for linux-i2c@vger.kernel.org; Tue, 17 Dec 2013 15:50:34 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.47]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id BB.73.06316.A34FFA25; Tue, 17 Dec 2013 15:50:34 +0900 (KST) X-AuditID: cbfee691-b7fe66d0000018ac-66-52aff43a67e6 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 3F.C4.22838.934FFA25; Tue, 17 Dec 2013 15:50:34 +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 <0MXX005EQV097Q80@mmp2.samsung.com>; Tue, 17 Dec 2013 15:50:33 +0900 (KST) From: Jingoo Han To: 'Wolfram Sang' Cc: linux-i2c@vger.kernel.org, 'Jingoo Han' References: <001601cefaf3$940d0040$bc2700c0$%han@samsung.com> In-reply-to: <001601cefaf3$940d0040$bc2700c0$%han@samsung.com> Subject: [PATCH 03/13] i2c: highlander: Use devm_*() functions Date: Tue, 17 Dec 2013 15:50:33 +0900 Message-id: <002701cefaf4$489c4c50$d9d4e4f0$%han@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7bit X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac7685PVHbujt8MeRNi0GNiruYn2+wAAGXbw Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrCIsWRmVeSWpSXmKPExsVy+t8zfV2rL+uDDDY2sVtcXniJ1aLj7xdG i5UnZjE7MHv0bVnF6HHy1BMWj8+b5AKYo7hsUlJzMstSi/TtErgyDl77z1TwTqhi+d4/bA2M C/i7GDk5JARMJNafXc0IYYtJXLi3nq2LkYtDSGAZo8SWXYvYYYo2H9jECpGYzijx4+4Zdgjn F6PEon/nWUGq2ATUJL58OQzWIQJkP/v4FWwss4CjxJG938DiQgK2En0rl4HFOQXsJG4t/AVm CwPZfWcng9WwCKhKrL7WwgJi8wLVn71xiw3CFpT4MfkeC8RMLYn1O48zQdjyEpvXvGXuYuQA ulRd4tFfXYgTjCTmHmtmhygRkdj34h0jyM0SArvYJT7s62SD2CUg8W3yIRaIXlmJTQeYIR6W lDi44gbLBEaJWUg2z0KyeRaSzbOQrFjAyLKKUTS1ILmgOCm9yFSvODG3uDQvXS85P3cTIyQG J+5gvH/A+hBjMtD6icxSosn5wBjOK4k3NDYzsjA1MTU2Mrc0I01YSZw3/VFSkJBAemJJanZq akFqUXxRaU5q8SFGJg5OqQZGo3kfLuxJfv3jQIPr643r+QTvhjrX17pxyhqVHPl+gbOR73js zR189m1hfQwt2g5PLYwnruy9s2Fine4iw8l3/3be+LZ4xsqm1p35M09uFjnG+PNUhEJaKOfK uee/h/3oVNu7+qXR1S8aO64+z9IKVr92VOrFlyK9/w/NNf+6Cn7TXFUo7XI3WYmlOCPRUIu5 qDgRACY29RLXAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrIKsWRmVeSWpSXmKPExsVy+t9jQV2rL+uDDA78YrK4vPASq0XH3y+M FitPzGJ2YPbo27KK0ePkqScsHp83yQUwRzUw2mSkJqakFimk5iXnp2TmpdsqeQfHO8ebmhkY 6hpaWpgrKeQl5qbaKrn4BOi6ZeYAbVJSKEvMKQUKBSQWFyvp22GaEBripmsB0xih6xsSBNdj ZIAGEtYxZhy89p+p4J1QxfK9f9gaGBfwdzFyckgImEhsPrCJFcIWk7hwbz1bFyMXh5DAdEaJ H3fPsEM4vxglFv07D1bFJqAm8eXLYXYQWwTIfvbxKyOIzSzgKHFk7zewuJCArUTfymVgcU4B O4lbC3+B2cJAdt/ZyWA1LAKqEquvtbCA2LxA9Wdv3GKDsAUlfky+xwIxU0ti/c7jTBC2vMTm NW+Zuxg5gC5Vl3j0VxfiBCOJucea2SFKRCT2vXjHOIFRaBaSSbOQTJqFZNIsJC0LGFlWMYqm FiQXFCel5xrqFSfmFpfmpesl5+duYgRH+DOpHYwrGywOMQpwMCrx8HLMXh8kxJpYVlyZe4hR goNZSYSXpQAoxJuSWFmVWpQfX1Sak1p8iDEZ6NGJzFKiyfnA5JNXEm9obGJmZGlkZmFkYm5O mrCSOO+BVutAIYH0xJLU7NTUgtQimC1MHJxSDYwFvluU1SyL+EIKlK96bHcsf9KfOT9GR/o6 93839YNC9lcWNOy59NRGJnbVWybNLfJTXDcLCFTFXJiy+ZQ+68c5jG8rH2cePyHJ8CQ42zfC 5qlWZcbXXatfXElb96FJ5O1xp20fmRede3FfZZ5QgMC5n0++eycuP2nK6RbS9rvVollVYr3+ ZBslluKMREMt5qLiRAAjTgKhNAMAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Use devm_*() functions to make cleanup paths simpler. Signed-off-by: Jingoo Han --- drivers/i2c/busses/i2c-highlander.c | 38 ++++++++++------------------------- 1 file changed, 11 insertions(+), 27 deletions(-) diff --git a/drivers/i2c/busses/i2c-highlander.c b/drivers/i2c/busses/i2c-highlander.c index 436b0f2..405dc4a 100644 --- a/drivers/i2c/busses/i2c-highlander.c +++ b/drivers/i2c/busses/i2c-highlander.c @@ -369,15 +369,15 @@ static int highlander_i2c_probe(struct platform_device *pdev) return -ENODEV; } - dev = kzalloc(sizeof(struct highlander_i2c_dev), GFP_KERNEL); + dev = devm_kzalloc(&pdev->dev, sizeof(struct highlander_i2c_dev), + GFP_KERNEL); if (unlikely(!dev)) return -ENOMEM; - dev->base = ioremap_nocache(res->start, resource_size(res)); - if (unlikely(!dev->base)) { - ret = -ENXIO; - goto err; - } + dev->base = devm_ioremap_nocache(&pdev->dev, res->start, + resource_size(res)); + if (unlikely(!dev->base)) + return -ENXIO; dev->dev = &pdev->dev; platform_set_drvdata(pdev, dev); @@ -387,10 +387,10 @@ static int highlander_i2c_probe(struct platform_device *pdev) dev->irq = 0; if (dev->irq) { - ret = request_irq(dev->irq, highlander_i2c_irq, 0, - pdev->name, dev); + ret = devm_request_irq(&pdev->dev, dev->irq, highlander_i2c_irq, + 0, pdev->name, dev); if (unlikely(ret)) - goto err_unmap; + return ret; highlander_i2c_irq_enable(dev); } else { @@ -417,26 +417,16 @@ static int highlander_i2c_probe(struct platform_device *pdev) ret = highlander_i2c_reset(dev); if (unlikely(ret)) { dev_err(&pdev->dev, "controller didn't come up\n"); - goto err_free_irq; + return ret; } ret = i2c_add_numbered_adapter(adap); if (unlikely(ret)) { dev_err(&pdev->dev, "failure adding adapter\n"); - goto err_free_irq; + return ret; } return 0; - -err_free_irq: - if (dev->irq) - free_irq(dev->irq, dev); -err_unmap: - iounmap(dev->base); -err: - kfree(dev); - - return ret; } static int highlander_i2c_remove(struct platform_device *pdev) @@ -445,12 +435,6 @@ static int highlander_i2c_remove(struct platform_device *pdev) i2c_del_adapter(&dev->adapter); - if (dev->irq) - free_irq(dev->irq, dev); - - iounmap(dev->base); - kfree(dev); - return 0; }