From patchwork Tue Dec 17 07:00:02 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 302011 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 27A112C00A4 for ; Tue, 17 Dec 2013 18:00:08 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752255Ab3LQHAG (ORCPT ); Tue, 17 Dec 2013 02:00:06 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:13139 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752074Ab3LQHAD (ORCPT ); Tue, 17 Dec 2013 02:00:03 -0500 Received: from epcpsbgr3.samsung.com (u143.gpu120.samsung.co.kr [203.254.230.143]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MXX00J4WVG21L90@mailout3.samsung.com> for linux-i2c@vger.kernel.org; Tue, 17 Dec 2013 16:00:02 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.49]) by epcpsbgr3.samsung.com (EPCPMTA) with SMTP id C5.89.05880.276FFA25; Tue, 17 Dec 2013 16:00:02 +0900 (KST) X-AuditID: cbfee68f-b7fe36d0000016f8-08-52aff672661b Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id A2.67.22838.276FFA25; Tue, 17 Dec 2013 16:00:02 +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 <0MXX005SAVG2FT70@mmp2.samsung.com>; Tue, 17 Dec 2013 16:00:02 +0900 (KST) From: Jingoo Han To: 'Wolfram Sang' Cc: linux-i2c@vger.kernel.org, 'Jingoo Han' , 'Barry Song' , 'Zhiwu Song' References: <001601cefaf3$940d0040$bc2700c0$%han@samsung.com> In-reply-to: <001601cefaf3$940d0040$bc2700c0$%han@samsung.com> Subject: [PATCH 10/13] i2c: sirf: Use devm_clk_get() Date: Tue, 17 Dec 2013 16:00:02 +0900 Message-id: <002e01cefaf5$9b77e320$d267a960$%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+wAAdpgQ Content-language: ko x-cr-hashedpuzzle: AJyM BpS2 H/hm Ku1w Lev8 Q2mu Vu82 XX1/ cXwg c9Ky f5C9 iS0q oJ72 tIe0 tVVB yMLl; 5; YgBhAG8AaAB1AGEALgBzAG8AbgBnAEAAYwBzAHIALgBjAG8AbQA7AGoAZwAxAC4AaABhAG4AQABzAGEAbQBzAHUAbgBnAC4AYwBvAG0AOwBsAGkAbgB1AHgALQBpADIAYwBAAHYAZwBlAHIALgBrAGUAcgBuAGUAbAAuAG8AcgBnADsAdwBzAGEAQAB0AGgAZQAtAGQAcgBlAGEAbQBzAC4AZABlADsAegBoAGkAdwB1AC4AcwBvAG4AZwBAAGMAcwByAC4AYwBvAG0A; Sosha1_v1; 7; {7E106B12-0AE5-426B-A9D6-2E873D594339}; agBnADEALgBoAGEAbgBAAHMAYQBtAHMAdQBuAGcALgBjAG8AbQA=; Tue, 17 Dec 2013 06:59:54 GMT; WwBQAEEAVABDAEgAIAAxADAALwAxADMAXQAgAGkAMgBjADoAIABzAGkAcgBmADoAIABVAHMAZQAgAGQAZQB2AG0AXwBjAGwAawBfAGcAZQB0ACgAKQA= x-cr-puzzleid: {7E106B12-0AE5-426B-A9D6-2E873D594339} X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrBIsWRmVeSWpSXmKPExsVy+t8zQ92ib+uDDJbs1bF4OfMqq8XlhZdY LTr+fmG0WHliFrPF4yV8Dqweu3bOYfXo27KK0ePkqScsHp83yQWwRHHZpKTmZJalFunbJXBl fFxziKVgLlfF3T7jBsYlHF2MnBwSAiYSn682MELYYhIX7q1n62Lk4hASWMYoMX/vVUaYoueP vzFBJKYzStx9docVwvnFKLH8wxwmkCo2ATWJL18Os4PYIkD2s49fGUGKmAW6GCVWLpkANkpI wFaib+UyMJtTwE7i1sJfYLYw0Ir1s78CTeXgYBFQlXg9VRckzAtU3vplCSOELSjxY/I9FhCb WUBLYv3O40wQtrzE5jVvmUFaJQTUJR791YU4wUjizBGIB5gFRCT2vXgH9cwPFomlh7whbFOJ P02rmSDst+wSOz8HgtgsAgIS3yYfYoEYKSux6QAzRImkxMEVN1gmMErNQnLQLCQHzUJy0Cwk mxcwsqxiFE0tSC4oTkovMtYrTswtLs1L10vOz93ECInl/h2Mdw9YH2JMBlo/kVlKNDkfmAry SuINjc2MLExNTI2NzC3NSBNWEue9/zApSEggPbEkNTs1tSC1KL6oNCe1+BAjEwenVAPjzLdz Fsxb8TpO6mDOmYMHaoOvzBP8oLVVxYiL9eX8W817Ll6OjIpgfPVe+aK5TUCoAVflhFW7LB/x J5o4tojzbNmT/ni2kUvCeqFDh3dLb82wUrhRkuLu+ESEy/FmiUZ6YUKuy32lvFMNP9luaR/2 fRtSzc0tp3jUWKflf1zp///vX6fqvAlXYinOSDTUYi4qTgQAN7LYqvsCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrGKsWRmVeSWpSXmKPExsVy+t9jQd2ib+uDDFrnaVi8nHmV1eLywkus Fh1/vzBarDwxi9ni8RI+B1aPXTvnsHr0bVnF6HHy1BMWj8+b5AJYohoYbTJSE1NSixRS85Lz UzLz0m2VvIPjneNNzQwMdQ0tLcyVFPISc1NtlVx8AnTdMnOA9ioplCXmlAKFAhKLi5X07TBN CA1x07WAaYzQ9Q0JgusxMkADCesYMz6uOcRSMJer4m6fcQPjEo4uRk4OCQETieePvzFB2GIS F+6tZ+ti5OIQEpjOKHH32R1WCOcXo8TyD3PAqtgE1CS+fDnMDmKLANnPPn5lBCliFuhilFi5 ZAIjSEJIwFaib+UyMJtTwE7i1sJfYLYw0Lr1s78CTeXgYBFQlXg9VRckzAtU3vplCSOELSjx Y/I9FhCbWUBLYv3O40wQtrzE5jVvmUFaJQTUJR791YU4wUjizJGrjBAlIhL7XrxjhHjmB4vE 0kPeELapxJ+m1UwTGEVmIdkwC8mGWUg2zEIyagEjyypG0dSC5ILipPRcQ73ixNzi0rx0veT8 3E2M4FTxTGoH48oGi0OMAhyMSjy8HLPXBwmxJpYVV+YeYpTgYFYS4WUpAArxpiRWVqUW5ccX leakFh9iTAb6fyKzlGhyPjCN5ZXEGxqbmBlZGplZGJmYm5MmrCTOe6DVOlBIID2xJDU7NbUg tQhmCxMHp1QDo8lK8eurBLnsyry2eauy/LVZmOYy85604K8tSqbbM+6LLJr28keLw+X+/1Lm Zn9D7p/4+39NZqh0HfulC282+MTNnFf8d/eOC6XyJjKmF9w/2M0yCHTY/fyf383JXxa9e7X7 Mw/To0OJ68Pv6tZcX2z81HNpp+05NemkbZ5Pm45VnZ32ad4FTU4lluKMREMt5qLiRAAgEnLW WQMAAA== 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_clk_get() to make cleanup paths simpler. Signed-off-by: Jingoo Han --- drivers/i2c/busses/i2c-sirf.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/i2c/busses/i2c-sirf.c b/drivers/i2c/busses/i2c-sirf.c index 6784f7f..c8fcddc 100644 --- a/drivers/i2c/busses/i2c-sirf.c +++ b/drivers/i2c/busses/i2c-sirf.c @@ -284,17 +284,16 @@ static int i2c_sirfsoc_probe(struct platform_device *pdev) int err; u32 regval; - clk = clk_get(&pdev->dev, NULL); + clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(clk)) { - err = PTR_ERR(clk); dev_err(&pdev->dev, "Clock get failed\n"); - goto err_get_clk; + return PTR_ERR(clk); } err = clk_prepare(clk); if (err) { dev_err(&pdev->dev, "Clock prepare failed\n"); - goto err_clk_prep; + return err; } err = clk_enable(clk); @@ -387,9 +386,6 @@ out: clk_disable(clk); err_clk_en: clk_unprepare(clk); -err_clk_prep: - clk_put(clk); -err_get_clk: return err; } @@ -401,7 +397,6 @@ static int i2c_sirfsoc_remove(struct platform_device *pdev) writel(SIRFSOC_I2C_RESET, siic->base + SIRFSOC_I2C_CTRL); i2c_del_adapter(adapter); clk_unprepare(siic->clk); - clk_put(siic->clk); return 0; }