From patchwork Tue Dec 17 06:46:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 302001 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 E29A82C0091 for ; Tue, 17 Dec 2013 17:46:37 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752163Ab3LQGqh (ORCPT ); Tue, 17 Dec 2013 01:46:37 -0500 Received: from mailout1.samsung.com ([203.254.224.24]:8568 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751725Ab3LQGqg (ORCPT ); Tue, 17 Dec 2013 01:46:36 -0500 Received: from epcpsbgr3.samsung.com (u143.gpu120.samsung.co.kr [203.254.230.143]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MXX008ZFUTIG380@mailout1.samsung.com> for linux-i2c@vger.kernel.org; Tue, 17 Dec 2013 15:46:30 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.51]) by epcpsbgr3.samsung.com (EPCPMTA) with SMTP id F4.72.05880.643FFA25; Tue, 17 Dec 2013 15:46:30 +0900 (KST) X-AuditID: cbfee68f-b7fe36d0000016f8-8f-52aff3460ec6 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id D4.B3.22838.643FFA25; Tue, 17 Dec 2013 15:46:30 +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 <0MXX00BXMUTHTNC0@mmp1.samsung.com>; Tue, 17 Dec 2013 15:46:30 +0900 (KST) From: Jingoo Han To: 'Wolfram Sang' Cc: linux-i2c@vger.kernel.org, 'Jingoo Han' , 'Stephen Warren' References: <001601cefaf3$940d0040$bc2700c0$%han@samsung.com> In-reply-to: <001601cefaf3$940d0040$bc2700c0$%han@samsung.com> Subject: [PATCH 01/13] i2c: bcm2835: Use devm_request_irq() Date: Tue, 17 Dec 2013 15:46:29 +0900 Message-id: <001d01cefaf3$b743e4c0$25cbae40$%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+wAAAXsA Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrDIsWRmVeSWpSXmKPExsVy+t8zY123z+uDDDrW8FlcXniJ1aLj7xdG i1cH21gsVp6YxezA4tG3ZRWjx8lTT1g8Pm+S89g4NzSAJYrLJiU1J7MstUjfLoEr4+LFe4wF u7kqVhz+ytrAeJOji5GTQ0LAROLYr2NMELaYxIV769m6GLk4hASWMUrsmv+BGaZo+stTTBCJ RYwST78sgKr6xSgxa8UesHY2ATWJL18Os4PYIkD2s49fGbsYOTiYBXIlOt4ngYSFBGwl+lYu YwSxOQXsJG4t/AVmCwtYS/w6tgeslUVAVeL+hk1gi3mB6hfducAGYQtK/Jh8jwXEZhbQkli/ 8zgThC0vsXnNW2aQVRIC6hKP/upCXGAk0bf3CSNEiYjEvhfvGEFOlhA4xS4x4/VuqF0CEt8m H2KB6JWV2HQA6l9JiYMrbrBMAHoOyeZZSDbPQrJ5FpIVCxhZVjGKphYkFxQnpRcZ6xUn5haX 5qXrJefnbmKExGT/Dsa7B6wPMSYDrZ/ILCWanA+M6bySeENjMyMLUxNTYyNzSzPShJXEee8/ TAoSEkhPLEnNTk0tSC2KLyrNSS0+xMjEwSnVwNh6qPHBoSsRnbILvU8kf+VauDxExYhj7aeJ P82PqW1wFHj4UoVZ7pxzApOV2MSOkuNSVguZXG32fTu/bkvbzIW3Mpud0j6b3Za5eNnFmfvG dl6JO2Z8Uy7+V9r2UGf15jrW9fOuzlpl87Hp9+ITGpceH60Oiq9YvLbnu8yzNb3nD28OmdFv YXJJiaU4I9FQi7moOBEA3jDjc98CAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrJKsWRmVeSWpSXmKPExsVy+t9jAV23z+uDDN6d47K4vPASq0XH3y+M Fq8OtrFYrDwxi9mBxaNvyypGj5OnnrB4fN4k57FxbmgAS1QDo01GamJKapFCal5yfkpmXrqt kndwvHO8qZmBoa6hpYW5kkJeYm6qrZKLT4CuW2YO0EolhbLEnFKgUEBicbGSvh2mCaEhbroW MI0Rur4hQXA9RgZoIGEdY8bFi/cYC3ZzVaw4/JW1gfEmRxcjJ4eEgInE9JenmCBsMYkL99az dTFycQgJLGKUePplAZTzi1Fi1oo9YFVsAmoSX74cZgexRYDsZx+/MnYxcnAwC+RKdLxPAgkL CdhK9K1cxghicwrYSdxa+AvMFhawlvh1bA9YK4uAqsT9DZuYQWxeoPpFdy6wQdiCEj8m32MB sZkFtCTW7zzOBGHLS2xe85YZZJWEgLrEo7+6EBcYSfTtfcIIUSIise/FO8YJjEKzkEyahWTS LCSTZiFpWcDIsopRNLUguaA4KT3XUK84Mbe4NC9dLzk/dxMjOOKfSe1gXNlgcYhRgINRiYeX Y/b6ICHWxLLiytxDjBIczEoivCwFQCHelMTKqtSi/Pii0pzU4kOMyUCPTmSWEk3OByajvJJ4 Q2MTMyNLIzMLIxNzc9KElcR5D7RaBwoJpCeWpGanphakFsFsYeLglGpgbP/JULxEdt52MSML yzsbQx4Iu5wJcHXd4HNlRUbGuW2vf26aVXhnypqokMbiuU81uT9YmUzjnH+xfcrEqtDFfxaV Bmzbu4xp16MvcRJf2V/Iv5jjFV/Xzfm/+Y+Le7xXT4HwDeOLcw0Dw1e/F96TFfxzh32Y750o x9bbYWoJgbNnLDH3d4mRU2Ipzkg01GIuKk4EAEojmL48AwAA 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_request_irq() to make cleanup paths simpler. Signed-off-by: Jingoo Han --- drivers/i2c/busses/i2c-bcm2835.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c index 77df97b..af60181 100644 --- a/drivers/i2c/busses/i2c-bcm2835.c +++ b/drivers/i2c/busses/i2c-bcm2835.c @@ -285,8 +285,8 @@ static int bcm2835_i2c_probe(struct platform_device *pdev) } i2c_dev->irq = irq->start; - ret = request_irq(i2c_dev->irq, bcm2835_i2c_isr, IRQF_SHARED, - dev_name(&pdev->dev), i2c_dev); + ret = devm_request_irq(&pdev->dev, i2c_dev->irq, bcm2835_i2c_isr, + IRQF_SHARED, dev_name(&pdev->dev), i2c_dev); if (ret) { dev_err(&pdev->dev, "Could not request IRQ\n"); return -ENODEV; @@ -304,8 +304,6 @@ static int bcm2835_i2c_probe(struct platform_device *pdev) bcm2835_i2c_writel(i2c_dev, BCM2835_I2C_C, 0); ret = i2c_add_adapter(adap); - if (ret) - free_irq(i2c_dev->irq, i2c_dev); return ret; } @@ -314,7 +312,6 @@ static int bcm2835_i2c_remove(struct platform_device *pdev) { struct bcm2835_i2c_dev *i2c_dev = platform_get_drvdata(pdev); - free_irq(i2c_dev->irq, i2c_dev); i2c_del_adapter(&i2c_dev->adapter); return 0;