From patchwork Tue Dec 17 06:53:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 302006 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 44D2B2C00A2 for ; Tue, 17 Dec 2013 17:53:21 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752163Ab3LQGxU (ORCPT ); Tue, 17 Dec 2013 01:53:20 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:11583 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752083Ab3LQGxT (ORCPT ); Tue, 17 Dec 2013 01:53:19 -0500 Received: from epcpsbgr1.samsung.com (u141.gpu120.samsung.co.kr [203.254.230.141]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MXX00I89V4UPE90@mailout3.samsung.com> for linux-i2c@vger.kernel.org; Tue, 17 Dec 2013 15:53:18 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.49]) by epcpsbgr1.samsung.com (EPCPMTA) with SMTP id 62.53.10132.ED4FFA25; Tue, 17 Dec 2013 15:53:18 +0900 (KST) X-AuditID: cbfee68d-b7ff46d000002794-54-52aff4deaf35 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 45.39.20899.ED4FFA25; Tue, 17 Dec 2013 15:53:18 +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 <0MXX005X3V4T7Q80@mmp2.samsung.com>; Tue, 17 Dec 2013 15:53:17 +0900 (KST) From: Jingoo Han To: 'Wolfram Sang' Cc: linux-i2c@vger.kernel.org, 'Jingoo Han' , 'Thierry Reding' , 'Gregory CLEMENT' References: <001601cefaf3$940d0040$bc2700c0$%han@samsung.com> In-reply-to: <001601cefaf3$940d0040$bc2700c0$%han@samsung.com> Subject: [PATCH 05/13] i2c: mv64xxx: Use devm_request_irq() Date: Tue, 17 Dec 2013 15:53:17 +0900 Message-id: <002901cefaf4$aa582270$ff086750$%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+wAANZoA Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrBIsWRmVeSWpSXmKPExsVy+t8zQ917X9YHGXzdJWKxqe0to8XlhZdY LTr+fmG0+LlrHovFyhOzmB1YPZ5susjosXPWXXaPvi2rGD1OnnrC4vF5k1wAaxSXTUpqTmZZ apG+XQJXxs4ThxgLTvBUrJpwiK2BcQdXFyMnh4SAicSER+uZIGwxiQv31rN1MXJxCAksY5RY 1tvGClM0+c1UZojEdEaJi29+M0I4vxglVmw4DlbFJqAm8eXLYXYQWwTIfvbxK1gRs8AqRolH X/eCFQkJ2Er0rVzGCGJzCthJ3Fr4C8wWFrCWmLTjD5jNIqAqsWLZXaA7ODh4gernPBADCfMK CEr8mHyPBcRmFtCSWL/zOBOELS+xec1bZpByCQF1iUd/dSFOMJLoOTuNEaJERGLfi3dg50gI 3GOXmN3/mxVilYDEt8mHWCB6ZSU2HWCGeFhS4uCKGywTGCVmIdk8C8nmWUg2z0KyYgEjyypG 0dSC5ILipPQiQ73ixNzi0rx0veT83E2MkFjt3cF4+4D1IcZkoPUTmaVEk/OBsZ5XEm9obGZk YWpiamxkbmlGmrCSOG/Sw6QgIYH0xJLU7NTUgtSi+KLSnNTiQ4xMHJxSDYxabqfbfnc+bW6w mPZR5PDSayUzQ6e8Pnfv33Pm2AcRcgllYhWiV/Xy18Zl75+/ZM42pgdis+dVrozkcXjQW1Tm kD0zV//QDYn0xe8/fHkluv3GGwmVaSuTvmgprrav4jFQ5PoencM4fV+MufHEK9LHvR4s27j4 7/eL/MYm01yvnEzdUfhOXldOiaU4I9FQi7moOBEA+xlKyesCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrKKsWRmVeSWpSXmKPExsVy+t9jQd17X9YHGVzaLGCxqe0to8XlhZdY LTr+fmG0+LlrHovFyhOzmB1YPZ5susjosXPWXXaPvi2rGD1OnnrC4vF5k1wAa1QDo01GamJK apFCal5yfkpmXrqtkndwvHO8qZmBoa6hpYW5kkJeYm6qrZKLT4CuW2YO0HYlhbLEnFKgUEBi cbGSvh2mCaEhbroWMI0Rur4hQXA9RgZoIGEdY8bOE4cYC07wVKyacIitgXEHVxcjJ4eEgInE 5DdTmSFsMYkL99azdTFycQgJTGeUuPjmNyOE84tRYsWG46wgVWwCahJfvhxmB7FFgOxnH7+C FTELrGKUePR1L1iRkICtRN/KZYwgNqeAncSthb/AbGEBa4lJO/6A2SwCqhIrlt0FWsfBwQtU P+eBGEiYV0BQ4sfkeywgNrOAlsT6nceZIGx5ic1r3jKDlEsIqEs8+qsLcYKRRM/ZaYwQJSIS +168Y5zAKDQLyaRZSCbNQjJpFpKWBYwsqxhFUwuSC4qT0nON9IoTc4tL89L1kvNzNzGCE8Ez 6R2MqxosDjEKcDAq8fByzF4fJMSaWFZcmXuIUYKDWUmEl6UAKMSbklhZlVqUH19UmpNafIgx GejPicxSosn5wCSVVxJvaGxiZmRpZGZhZGJuTpqwkjjvwVbrQCGB9MSS1OzU1ILUIpgtTByc Ug2M0Yf5n9xdMTlP/4b2vZWvq33qLBxOscqvvBQcY/A+peELT/ByL4HUu90HOZgXX9Vx/Pun ovveKu11rrWeRtxGrwU21/297fLuP4PemYu14vcXXcgrL118ZZq63LJ9l9aIeOUcfMNoJLPD wtw0ZaOHmm6e+wwrhWVP1b6HurRNOJvblil43rVXiaU4I9FQi7moOBEAq/rSL0gDAAA= 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-mv64xxx.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c index 8be7e42..d94ed5a 100644 --- a/drivers/i2c/busses/i2c-mv64xxx.c +++ b/drivers/i2c/busses/i2c-mv64xxx.c @@ -859,8 +859,8 @@ mv64xxx_i2c_probe(struct platform_device *pd) mv64xxx_i2c_hw_init(drv_data); - rc = request_irq(drv_data->irq, mv64xxx_i2c_intr, 0, - MV64XXX_I2C_CTLR_NAME, drv_data); + rc = devm_request_irq(&pd->dev, drv_data->irq, mv64xxx_i2c_intr, 0, + MV64XXX_I2C_CTLR_NAME, drv_data); if (rc) { dev_err(&drv_data->adapter.dev, "mv64xxx: Can't register intr handler irq%d: %d\n", @@ -869,13 +869,11 @@ mv64xxx_i2c_probe(struct platform_device *pd) } else if ((rc = i2c_add_numbered_adapter(&drv_data->adapter)) != 0) { dev_err(&drv_data->adapter.dev, "mv64xxx: Can't add i2c adapter, rc: %d\n", -rc); - goto exit_free_irq; + goto exit_clk; } return 0; -exit_free_irq: - free_irq(drv_data->irq, drv_data); exit_clk: #if defined(CONFIG_HAVE_CLK) /* Not all platforms have a clk */ @@ -893,7 +891,6 @@ mv64xxx_i2c_remove(struct platform_device *dev) struct mv64xxx_i2c_data *drv_data = platform_get_drvdata(dev); i2c_del_adapter(&drv_data->adapter); - free_irq(drv_data->irq, drv_data); #if defined(CONFIG_HAVE_CLK) /* Not all platforms have a clk */ if (!IS_ERR(drv_data->clk)) {