From patchwork Tue Dec 17 06:57:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 302009 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 E74C52C007E for ; Tue, 17 Dec 2013 17:57:40 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752649Ab3LQG5k (ORCPT ); Tue, 17 Dec 2013 01:57:40 -0500 Received: from mailout4.samsung.com ([203.254.224.34]:18364 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751725Ab3LQG5j (ORCPT ); Tue, 17 Dec 2013 01:57:39 -0500 Received: from epcpsbgr3.samsung.com (u143.gpu120.samsung.co.kr [203.254.230.143]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MXX00EQWVBXLKA0@mailout4.samsung.com> for linux-i2c@vger.kernel.org; Tue, 17 Dec 2013 15:57:33 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.50]) by epcpsbgr3.samsung.com (EPCPMTA) with SMTP id 35.38.05880.CD5FFA25; Tue, 17 Dec 2013 15:57:33 +0900 (KST) X-AuditID: cbfee68f-b7fe36d0000016f8-41-52aff5dc5bae Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 05.9A.20899.CD5FFA25; Tue, 17 Dec 2013 15:57:32 +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 <0MXX00HLAVBWIK10@mmp1.samsung.com>; Tue, 17 Dec 2013 15:57:32 +0900 (KST) From: Jingoo Han To: 'Wolfram Sang' Cc: linux-i2c@vger.kernel.org, 'Jingoo Han' , 'Leilei Shang' , 'Haojian Zhuang' References: <001601cefaf3$940d0040$bc2700c0$%han@samsung.com> In-reply-to: <001601cefaf3$940d0040$bc2700c0$%han@samsung.com> Subject: [PATCH 08/13] i2c: pxa: Use devm_*() functions Date: Tue, 17 Dec 2013 15:57:32 +0900 Message-id: <002c01cefaf5$4235b2b0$c6a11810$%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+wAAWeuw Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrGIsWRmVeSWpSXmKPExsVy+t8zI927X9cHGfRNYLK4sM7c4vLCS6wW HX+/MFp0vDzIZrHyxCxmB1aPnbPusntMXniR2aNvyypGj5OnnrB4fN4kF8AaxWWTkpqTWZZa pG+XwJVxds5/xoKZshWzV/9gbGC8KN7FyMkhIWAi0b2ylQ3CFpO4cG89kM3FISSwjFGicdZj 1i5GDrCiY40iEPFFjBJnuhtYIJxfjBLT25sYQbrZBNQkvnw5zA5iiwDZzz5+ZQQpYhaYwShx b/9hsCIhAVuJvpXLwGxOATuJWwt/gdnCAuYSnzpms4LYLAKqEnO73zKCbOYFqr/eogkS5hUQ lPgx+R4LiM0soCWxfudxJghbXmLzmrfMEIeqSzz6qwtxgpHE/L/9jBAlIhL7XrwDO0dC4Ba7 xOqmdewQqwQkvk0+xALRKyux6QAzJCAkJQ6uuMEygVFiFpLNs5BsnoVk8ywkKxYwsqxiFE0t SC4oTkovMtYrTswtLs1L10vOz93ECInT/h2Mdw9YH2JMBlo/kVlKNDkfGOd5JfGGxmZGFqYm psZG5pZmpAkrifPef5gUJCSQnliSmp2aWpBaFF9UmpNafIiRiYNTqoHxsPrln/++G3xn2v7X 22rT4//OPWt0Vbef19LRfP7j5o+b6xqVzU6YvWfdcULAJrfKXnT/9+V/XFuXBpUp3NL6k53b ePyP2BvDu/sfhsyY9IMnaoP90sN3Hj79cP6yuKJi+YyC7LkZLbM9jI+ZZtTmTjdkfNNz9LPF YvHul1+WdGb0WYc+Py/GrcRSnJFoqMVcVJwIAFpB0FfpAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrMKsWRmVeSWpSXmKPExsVy+t9jAd07X9cHGWx8Y2VxYZ25xeWFl1gt Ov5+YbToeHmQzWLliVnMDqweO2fdZfeYvPAis0ffllWMHidPPWHx+LxJLoA1qoHRJiM1MSW1 SCE1Lzk/JTMv3VbJOzjeOd7UzMBQ19DSwlxJIS8xN9VWycUnQNctMwdouZJCWWJOKVAoILG4 WEnfDtOE0BA3XQuYxghd35AguB4jAzSQsI4x4+yc/4wFM2UrZq/+wdjAeFG8i5GDQ0LAROJY o0gXIyeQKSZx4d56ti5GLg4hgUWMEme6G1ggnF+MEtPbmxhBqtgE1CS+fDnMDmKLANnPPn5l BCliFpjBKHFv/2GwIiEBW4m+lcvAbE4BO4lbC3+B2cIC5hKfOmazgtgsAqoSc7vfMoJcwQtU f71FEyTMKyAo8WPyPRYQm1lAS2L9zuNMELa8xOY1b5khjlaXePRXF+IEI4n5f/sZIUpEJPa9 eMc4gVFoFpJJs5BMmoVk0iwkLQsYWVYxiqYWJBcUJ6XnGukVJ+YWl+al6yXn525iBCeBZ9I7 GFc1WBxiFOBgVOLh5Zi9PkiINbGsuDL3EKMEB7OSCC9LAVCINyWxsiq1KD++qDQntfgQYzLQ nxOZpUST84EJKq8k3tDYxMzI0sjMwsjE3Jw0YSVx3oOt1oFCAumJJanZqakFqUUwW5g4OKUa GIu5F13Ou9JxzfTbnikPfKRv9uy08U15sfB7zGcHnt3iH4pXKt+SmLlwt8bs9jLmlbZGHnz+ Tv3LWFc1NluY+GxbsLblkzCzZsUx4X/xB32+yat+65z1v2SD30r/N2v8C3w7k9urvf71BAix 1zJP02VlCp+Vp7129cvWEzu/fbufckxGib3BUomlOCPRUIu5qDgRANHUbglGAwAA 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-pxa.c | 66 ++++++++++++------------------------------ 1 file changed, 18 insertions(+), 48 deletions(-) diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index bbe6dfb..be392b0 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c @@ -1141,11 +1141,9 @@ static int i2c_pxa_probe(struct platform_device *dev) struct resource *res = NULL; int ret, irq; - i2c = kzalloc(sizeof(struct pxa_i2c), GFP_KERNEL); - if (!i2c) { - ret = -ENOMEM; - goto emalloc; - } + i2c = devm_kzalloc(&dev->dev, sizeof(struct pxa_i2c), GFP_KERNEL); + if (!i2c) + return -ENOMEM; /* Default adapter num to device id; i2c_pxa_probe_dt can override. */ i2c->adap.nr = dev->id; @@ -1154,19 +1152,12 @@ static int i2c_pxa_probe(struct platform_device *dev) if (ret > 0) ret = i2c_pxa_probe_pdata(dev, i2c, &i2c_type); if (ret < 0) - goto eclk; + return ret; res = platform_get_resource(dev, IORESOURCE_MEM, 0); irq = platform_get_irq(dev, 0); - if (res == NULL || irq < 0) { - ret = -ENODEV; - goto eclk; - } - - if (!request_mem_region(res->start, resource_size(res), res->name)) { - ret = -ENOMEM; - goto eclk; - } + if (res == NULL || irq < 0) + return -ENODEV; i2c->adap.owner = THIS_MODULE; i2c->adap.retries = 5; @@ -1176,17 +1167,14 @@ static int i2c_pxa_probe(struct platform_device *dev) strlcpy(i2c->adap.name, "pxa_i2c-i2c", sizeof(i2c->adap.name)); - i2c->clk = clk_get(&dev->dev, NULL); - if (IS_ERR(i2c->clk)) { - ret = PTR_ERR(i2c->clk); - goto eclk; - } + i2c->clk = devm_clk_get(&dev->dev, NULL); + if (IS_ERR(i2c->clk)) + return PTR_ERR(i2c->clk); + + i2c->reg_base = devm_ioremap_resource(&dev->dev, res); + if (IS_ERR(i2c->reg_base)) + return PTR_ERR(i2c->reg_base); - i2c->reg_base = ioremap(res->start, resource_size(res)); - if (!i2c->reg_base) { - ret = -EIO; - goto eremap; - } i2c->reg_ibmr = i2c->reg_base + pxa_reg_layout[i2c_type].ibmr; i2c->reg_idbr = i2c->reg_base + pxa_reg_layout[i2c_type].idbr; @@ -1227,10 +1215,10 @@ static int i2c_pxa_probe(struct platform_device *dev) i2c->adap.algo = &i2c_pxa_pio_algorithm; } else { i2c->adap.algo = &i2c_pxa_algorithm; - ret = request_irq(irq, i2c_pxa_handler, IRQF_SHARED, - dev_name(&dev->dev), i2c); + ret = devm_request_irq(&dev->dev, irq, i2c_pxa_handler, + IRQF_SHARED, dev_name(&dev->dev), i2c); if (ret) - goto ereqirq; + goto err; } i2c_pxa_reset(i2c); @@ -1244,7 +1232,7 @@ static int i2c_pxa_probe(struct platform_device *dev) ret = i2c_add_numbered_adapter(&i2c->adap); if (ret < 0) { printk(KERN_INFO "I2C: Failed to add bus\n"); - goto eadapt; + goto err; } platform_set_drvdata(dev, i2c); @@ -1258,18 +1246,8 @@ static int i2c_pxa_probe(struct platform_device *dev) #endif return 0; -eadapt: - if (!i2c->use_pio) - free_irq(irq, i2c); -ereqirq: +err: clk_disable_unprepare(i2c->clk); - iounmap(i2c->reg_base); -eremap: - clk_put(i2c->clk); -eclk: - kfree(i2c); -emalloc: - release_mem_region(res->start, resource_size(res)); return ret; } @@ -1278,15 +1256,7 @@ static int i2c_pxa_remove(struct platform_device *dev) struct pxa_i2c *i2c = platform_get_drvdata(dev); i2c_del_adapter(&i2c->adap); - if (!i2c->use_pio) - free_irq(i2c->irq, i2c); - clk_disable_unprepare(i2c->clk); - clk_put(i2c->clk); - - iounmap(i2c->reg_base); - release_mem_region(i2c->iobase, i2c->iosize); - kfree(i2c); return 0; }