From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754901AbcBBM4j (ORCPT ); Tue, 2 Feb 2016 07:56:39 -0500 Received: from mail-am1on0145.outbound.protection.outlook.com ([157.56.112.145]:24856 "EHLO emea01-am1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754430AbcBBM4h convert rfc822-to-8bit (ORCPT ); Tue, 2 Feb 2016 07:56:37 -0500 From: "Gujulan Elango, Hari Prasath (H.)" To: "gregkh@linuxfoundation.org" , "jic23@kernel.org" , "dan.carpenter@oracle.com" , "mranostay@gmail.com" , "knaack.h@gmx.de" , "lars@metafoo.de" CC: "ciorneiioana@gmail.com" , "daniel.baluta@intel.com" , "hamohammed.sa@gmail.com" , "linux-iio@vger.kernel.org" , "devel@driverdev.osuosl.org" , "linux-kernel@vger.kernel.org" , "Babu, Viswanathan (V.)" Subject: [PATCHv3] staging: iio: replace clk_get() with devm_clk_get() Thread-Topic: [PATCHv3] staging: iio: replace clk_get() with devm_clk_get() Thread-Index: AQHRXbkjwYuDq6wsJkq0YTAQyE3zSg== Date: Tue, 2 Feb 2016 12:56:32 +0000 Message-ID: <20160202125741.GA9279@IND12F0122> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: linuxfoundation.org; dkim=none (message not signed) header.d=none;linuxfoundation.org; dmarc=none action=none header.from=visteon.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [74.112.164.118] x-microsoft-exchange-diagnostics: 1;AM3PR06MB449;5:fUeA/7jKfO981F76xzmu9kHzigoXZV/r6umWrgDB6/iVicrrAvsiJwhAhMogC32arfGKa5tn8sWWEMOL2S4u+h2rq5OI+Cj2AG/9XYlmFix6kDLdgemDg3J87LOvl/PD+4um+TJS5z0L675TM1o/Zw==;24:p7CtXGA8WwKV3gjJ0rzwc2kSJ3T7QHrOASHBjFtl3E6z3LCHM/JVcbkeO5DN2BXr9IFCP+mB1D+/aXH8BxutcDuHSmXugxYYeVE2NrHY99s= x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:AM3PR06MB449; x-ms-office365-filtering-correlation-id: 91b4fc25-95e5-4d06-36c7-08d32bd0467f x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(208512329853888); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001);SRVR:AM3PR06MB449;BCL:0;PCL:0;RULEID:;SRVR:AM3PR06MB449; x-forefront-prvs: 084080FC15 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(6009001)(5004730100002)(4326007)(10400500002)(5008740100001)(19580405001)(50986999)(2501003)(33656002)(189998001)(19580395003)(2900100001)(2906002)(2201001)(66066001)(86362001)(77096005)(106116001)(33716001)(92566002)(5002640100001)(87936001)(5001770100001)(3280700002)(586003)(1076002)(3660700001)(1096002)(6116002)(1220700001)(102836003)(229853001)(40100003)(5001960100002)(4001430100002)(122556002)(107886002)(54356999);DIR:OUT;SFP:1102;SCL:1;SRVR:AM3PR06MB449;H:HE1PR06MB1580.eurprd06.prod.outlook.com;FPR:;SPF:None;MLV:sfv;LANG:en; Content-Type: text/plain; charset="us-ascii" Content-ID: Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 X-OriginatorOrg: visteon.com X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Feb 2016 12:56:32.4368 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 7a147aaf-01ec-498c-80a1-e34a8c63c548 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM3PR06MB449 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch replaces the clk_get() with devm_clk_get().Accordingly,modified the error paths,rename error labels and removed clk_put() in probe() & remove functions. Signed-off-by: Hari Prasath Gujulan Elango --- v3: Rename error path labels to suite modified code as reviewd by Matt Ranostay. Remove clk_put() from the driver remove method as pointed by Jonathan Cameron. v2: From email address was missing as pointed by Dan Carpenter. --- drivers/staging/iio/adc/spear_adc.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/drivers/staging/iio/adc/spear_adc.c b/drivers/staging/iio/adc/spear_adc.c index 712cae0..f2c0065 100644 --- a/drivers/staging/iio/adc/spear_adc.c +++ b/drivers/staging/iio/adc/spear_adc.c @@ -288,7 +288,7 @@ static int spear_adc_probe(struct platform_device *pdev) st->adc_base_spear3xx = (struct adc_regs_spear3xx __iomem *)st->adc_base_spear6xx; - st->clk = clk_get(dev, NULL); + st->clk = devm_clk_get(dev, NULL); if (IS_ERR(st->clk)) { dev_err(dev, "failed getting clock\n"); goto errout1; @@ -297,28 +297,28 @@ static int spear_adc_probe(struct platform_device *pdev) ret = clk_prepare_enable(st->clk); if (ret) { dev_err(dev, "failed enabling clock\n"); - goto errout2; + goto errout1; } irq = platform_get_irq(pdev, 0); if (irq <= 0) { dev_err(dev, "failed getting interrupt resource\n"); ret = -EINVAL; - goto errout3; + goto errout2; } ret = devm_request_irq(dev, irq, spear_adc_isr, 0, SPEAR_ADC_MOD_NAME, st); if (ret < 0) { dev_err(dev, "failed requesting interrupt\n"); - goto errout3; + goto errout2; } if (of_property_read_u32(np, "sampling-frequency", &st->sampling_freq)) { dev_err(dev, "sampling-frequency missing in DT\n"); ret = -EINVAL; - goto errout3; + goto errout2; } /* @@ -348,16 +348,14 @@ static int spear_adc_probe(struct platform_device *pdev) ret = iio_device_register(indio_dev); if (ret) - goto errout3; + goto errout2; dev_info(dev, "SPEAR ADC driver loaded, IRQ %d\n", irq); return 0; -errout3: - clk_disable_unprepare(st->clk); errout2: - clk_put(st->clk); + clk_disable_unprepare(st->clk); errout1: iounmap(st->adc_base_spear6xx); return ret; @@ -370,7 +368,6 @@ static int spear_adc_remove(struct platform_device *pdev) iio_device_unregister(indio_dev); clk_disable_unprepare(st->clk); - clk_put(st->clk); iounmap(st->adc_base_spear6xx); return 0; -- 1.9.1