From patchwork Sat Aug 26 02:29:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jinjie Ruan X-Patchwork-Id: 13366476 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 16408C83F13 for ; Sat, 26 Aug 2023 02:30:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231728AbjHZCaI (ORCPT ); Fri, 25 Aug 2023 22:30:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49768 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231727AbjHZC3i (ORCPT ); Fri, 25 Aug 2023 22:29:38 -0400 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D020A8 for ; Fri, 25 Aug 2023 19:29:36 -0700 (PDT) Received: from kwepemi500008.china.huawei.com (unknown [172.30.72.57]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4RXgg65BcqzJrnc; Sat, 26 Aug 2023 10:26:26 +0800 (CST) Received: from huawei.com (10.90.53.73) by kwepemi500008.china.huawei.com (7.221.188.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Sat, 26 Aug 2023 10:29:34 +0800 From: Jinjie Ruan To: , , , , , , , , , Subject: [PATCH -next v2 1/3] iio: adc: at91_adc: Use devm_clk_get_enabled() helper function Date: Sat, 26 Aug 2023 10:29:20 +0800 Message-ID: <20230826022922.3457054-2-ruanjinjie@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230826022922.3457054-1-ruanjinjie@huawei.com> References: <20230826022922.3457054-1-ruanjinjie@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.90.53.73] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemi500008.china.huawei.com (7.221.188.139) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org The devm_clk_get_enabled() helper: - calls devm_clk_get() - calls clk_prepare_enable() and registers what is needed in order to call clk_disable_unprepare() when needed, as a managed resource. This simplifies the code. Signed-off-by: Jinjie Ruan --- drivers/iio/adc/at91_adc.c | 38 ++++++++++---------------------------- 1 file changed, 10 insertions(+), 28 deletions(-) diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c index de6650f9c4b1..318e33ce22fb 100644 --- a/drivers/iio/adc/at91_adc.c +++ b/drivers/iio/adc/at91_adc.c @@ -1087,32 +1087,20 @@ static int at91_adc_probe(struct platform_device *pdev) return ret; } - st->clk = devm_clk_get(&pdev->dev, "adc_clk"); + st->clk = devm_clk_get_enabled(&pdev->dev, "adc_clk"); if (IS_ERR(st->clk)) { - dev_err(&pdev->dev, "Failed to get the clock.\n"); - ret = PTR_ERR(st->clk); - goto error_free_irq; - } - - ret = clk_prepare_enable(st->clk); - if (ret) { dev_err(&pdev->dev, "Could not prepare or enable the clock.\n"); + ret = PTR_ERR(st->clk); goto error_free_irq; } - st->adc_clk = devm_clk_get(&pdev->dev, "adc_op_clk"); + st->adc_clk = devm_clk_get_enabled(&pdev->dev, "adc_op_clk"); if (IS_ERR(st->adc_clk)) { - dev_err(&pdev->dev, "Failed to get the ADC clock.\n"); - ret = PTR_ERR(st->adc_clk); - goto error_disable_clk; - } - - ret = clk_prepare_enable(st->adc_clk); - if (ret) { dev_err(&pdev->dev, "Could not prepare or enable the ADC clock.\n"); - goto error_disable_clk; + ret = PTR_ERR(st->adc_clk); + goto error_free_irq; } /* @@ -1132,7 +1120,7 @@ static int at91_adc_probe(struct platform_device *pdev) if (!st->startup_time) { dev_err(&pdev->dev, "No startup time available.\n"); ret = -EINVAL; - goto error_disable_adc_clk; + goto error_free_irq; } ticks = (*st->caps->calc_startup_ticks)(st->startup_time, adc_clk_khz); @@ -1160,7 +1148,7 @@ static int at91_adc_probe(struct platform_device *pdev) ret = at91_adc_channel_init(idev); if (ret < 0) { dev_err(&pdev->dev, "Couldn't initialize the channels.\n"); - goto error_disable_adc_clk; + goto error_free_irq; } init_waitqueue_head(&st->wq_data_avail); @@ -1175,19 +1163,19 @@ static int at91_adc_probe(struct platform_device *pdev) ret = at91_adc_buffer_init(idev); if (ret < 0) { dev_err(&pdev->dev, "Couldn't initialize the buffer.\n"); - goto error_disable_adc_clk; + goto error_free_irq; } ret = at91_adc_trigger_init(idev); if (ret < 0) { dev_err(&pdev->dev, "Couldn't setup the triggers.\n"); at91_adc_buffer_remove(idev); - goto error_disable_adc_clk; + goto error_free_irq; } } else { ret = at91_ts_register(idev, pdev); if (ret) - goto error_disable_adc_clk; + goto error_free_irq; at91_ts_hw_init(idev, adc_clk_khz); } @@ -1207,10 +1195,6 @@ static int at91_adc_probe(struct platform_device *pdev) } else { at91_ts_unregister(st); } -error_disable_adc_clk: - clk_disable_unprepare(st->adc_clk); -error_disable_clk: - clk_disable_unprepare(st->clk); error_free_irq: free_irq(st->irq, idev); return ret; @@ -1228,8 +1212,6 @@ static int at91_adc_remove(struct platform_device *pdev) } else { at91_ts_unregister(st); } - clk_disable_unprepare(st->adc_clk); - clk_disable_unprepare(st->clk); free_irq(st->irq, idev); return 0; From patchwork Sat Aug 26 02:29:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jinjie Ruan X-Patchwork-Id: 13366474 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E6772C83F11 for ; Sat, 26 Aug 2023 02:30:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231722AbjHZCaG (ORCPT ); Fri, 25 Aug 2023 22:30:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231728AbjHZC3j (ORCPT ); Fri, 25 Aug 2023 22:29:39 -0400 Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 72E93A8 for ; Fri, 25 Aug 2023 19:29:37 -0700 (PDT) Received: from kwepemi500008.china.huawei.com (unknown [172.30.72.55]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4RXghy64blz1L9PF; Sat, 26 Aug 2023 10:28:02 +0800 (CST) Received: from huawei.com (10.90.53.73) by kwepemi500008.china.huawei.com (7.221.188.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Sat, 26 Aug 2023 10:29:35 +0800 From: Jinjie Ruan To: , , , , , , , , , Subject: [PATCH -next v2 2/3] iio: adc: at91_adc: Use devm_request_irq() helper function Date: Sat, 26 Aug 2023 10:29:21 +0800 Message-ID: <20230826022922.3457054-3-ruanjinjie@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230826022922.3457054-1-ruanjinjie@huawei.com> References: <20230826022922.3457054-1-ruanjinjie@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.90.53.73] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemi500008.china.huawei.com (7.221.188.139) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org Use devm_request_irq() to request the interrupt, so we can avoid having to manually clean this up. Signed-off-by: Jinjie Ruan --- drivers/iio/adc/at91_adc.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c index 318e33ce22fb..2ac1b64f0fb7 100644 --- a/drivers/iio/adc/at91_adc.c +++ b/drivers/iio/adc/at91_adc.c @@ -1077,11 +1077,13 @@ static int at91_adc_probe(struct platform_device *pdev) at91_adc_writel(st, AT91_ADC_IDR, 0xFFFFFFFF); if (st->caps->has_tsmr) - ret = request_irq(st->irq, at91_adc_9x5_interrupt, 0, - pdev->dev.driver->name, idev); + ret = devm_request_irq(&pdev->dev, st->irq, + at91_adc_9x5_interrupt, 0, + pdev->dev.driver->name, idev); else - ret = request_irq(st->irq, at91_adc_rl_interrupt, 0, - pdev->dev.driver->name, idev); + ret = devm_request_irq(&pdev->dev, st->irq, + at91_adc_rl_interrupt, 0, + pdev->dev.driver->name, idev); if (ret) { dev_err(&pdev->dev, "Failed to allocate IRQ.\n"); return ret; @@ -1092,7 +1094,7 @@ static int at91_adc_probe(struct platform_device *pdev) dev_err(&pdev->dev, "Could not prepare or enable the clock.\n"); ret = PTR_ERR(st->clk); - goto error_free_irq; + return ret; } st->adc_clk = devm_clk_get_enabled(&pdev->dev, "adc_op_clk"); @@ -1100,7 +1102,7 @@ static int at91_adc_probe(struct platform_device *pdev) dev_err(&pdev->dev, "Could not prepare or enable the ADC clock.\n"); ret = PTR_ERR(st->adc_clk); - goto error_free_irq; + return ret; } /* @@ -1119,8 +1121,7 @@ static int at91_adc_probe(struct platform_device *pdev) if (!st->startup_time) { dev_err(&pdev->dev, "No startup time available.\n"); - ret = -EINVAL; - goto error_free_irq; + return -EINVAL; } ticks = (*st->caps->calc_startup_ticks)(st->startup_time, adc_clk_khz); @@ -1148,7 +1149,7 @@ static int at91_adc_probe(struct platform_device *pdev) ret = at91_adc_channel_init(idev); if (ret < 0) { dev_err(&pdev->dev, "Couldn't initialize the channels.\n"); - goto error_free_irq; + return ret; } init_waitqueue_head(&st->wq_data_avail); @@ -1163,19 +1164,19 @@ static int at91_adc_probe(struct platform_device *pdev) ret = at91_adc_buffer_init(idev); if (ret < 0) { dev_err(&pdev->dev, "Couldn't initialize the buffer.\n"); - goto error_free_irq; + return ret; } ret = at91_adc_trigger_init(idev); if (ret < 0) { dev_err(&pdev->dev, "Couldn't setup the triggers.\n"); at91_adc_buffer_remove(idev); - goto error_free_irq; + return ret; } } else { ret = at91_ts_register(idev, pdev); if (ret) - goto error_free_irq; + return ret; at91_ts_hw_init(idev, adc_clk_khz); } @@ -1195,8 +1196,6 @@ static int at91_adc_probe(struct platform_device *pdev) } else { at91_ts_unregister(st); } -error_free_irq: - free_irq(st->irq, idev); return ret; } @@ -1212,7 +1211,6 @@ static int at91_adc_remove(struct platform_device *pdev) } else { at91_ts_unregister(st); } - free_irq(st->irq, idev); return 0; } From patchwork Sat Aug 26 02:29:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jinjie Ruan X-Patchwork-Id: 13366475 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3B14FC83F12 for ; Sat, 26 Aug 2023 02:30:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231727AbjHZCaJ (ORCPT ); Fri, 25 Aug 2023 22:30:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49786 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231730AbjHZC3k (ORCPT ); Fri, 25 Aug 2023 22:29:40 -0400 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5FB73128 for ; Fri, 25 Aug 2023 19:29:38 -0700 (PDT) Received: from kwepemi500008.china.huawei.com (unknown [172.30.72.56]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4RXgg85bb5zJrnf; Sat, 26 Aug 2023 10:26:28 +0800 (CST) Received: from huawei.com (10.90.53.73) by kwepemi500008.china.huawei.com (7.221.188.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.31; Sat, 26 Aug 2023 10:29:36 +0800 From: Jinjie Ruan To: , , , , , , , , , Subject: [PATCH -next v2 3/3] iio: adc: at91_adc: Simplify with dev_err_probe() Date: Sat, 26 Aug 2023 10:29:22 +0800 Message-ID: <20230826022922.3457054-4-ruanjinjie@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230826022922.3457054-1-ruanjinjie@huawei.com> References: <20230826022922.3457054-1-ruanjinjie@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.90.53.73] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To kwepemi500008.china.huawei.com (7.221.188.139) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org Use the dev_err_probe() helper to simplify error handling during probe. This also handle scenario, when EDEFER is returned and useless error is printed. Signed-off-by: Jinjie Ruan --- drivers/iio/adc/at91_adc.c | 65 ++++++++++++++------------------------ 1 file changed, 24 insertions(+), 41 deletions(-) diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c index 2ac1b64f0fb7..a49f7021c73f 100644 --- a/drivers/iio/adc/at91_adc.c +++ b/drivers/iio/adc/at91_adc.c @@ -1013,28 +1013,25 @@ static int at91_adc_probe(struct platform_device *pdev) st->use_external = of_property_read_bool(node, "atmel,adc-use-external-triggers"); - if (of_property_read_u32(node, "atmel,adc-channels-used", &prop)) { - dev_err(&idev->dev, "Missing adc-channels-used property in the DT.\n"); - return -EINVAL; - } + if (of_property_read_u32(node, "atmel,adc-channels-used", &prop)) + return dev_err_probe(&idev->dev, -EINVAL, + "Missing adc-channels-used property in the DT.\n"); st->channels_mask = prop; st->sleep_mode = of_property_read_bool(node, "atmel,adc-sleep-mode"); - if (of_property_read_u32(node, "atmel,adc-startup-time", &prop)) { - dev_err(&idev->dev, "Missing adc-startup-time property in the DT.\n"); - return -EINVAL; - } + if (of_property_read_u32(node, "atmel,adc-startup-time", &prop)) + return dev_err_probe(&idev->dev, -EINVAL, + "Missing adc-startup-time property in the DT.\n"); st->startup_time = prop; prop = 0; of_property_read_u32(node, "atmel,adc-sample-hold-time", &prop); st->sample_hold_time = prop; - if (of_property_read_u32(node, "atmel,adc-vref", &prop)) { - dev_err(&idev->dev, "Missing adc-vref property in the DT.\n"); - return -EINVAL; - } + if (of_property_read_u32(node, "atmel,adc-vref", &prop)) + return dev_err_probe(&idev->dev, -EINVAL, + "Missing adc-vref property in the DT.\n"); st->vref_mv = prop; st->res = st->caps->high_res_bits; @@ -1069,7 +1066,6 @@ static int at91_adc_probe(struct platform_device *pdev) if (IS_ERR(st->reg_base)) return PTR_ERR(st->reg_base); - /* * Disable all IRQs before setting up the handler */ @@ -1084,26 +1080,18 @@ static int at91_adc_probe(struct platform_device *pdev) ret = devm_request_irq(&pdev->dev, st->irq, at91_adc_rl_interrupt, 0, pdev->dev.driver->name, idev); - if (ret) { - dev_err(&pdev->dev, "Failed to allocate IRQ.\n"); - return ret; - } + if (ret) + return dev_err_probe(&pdev->dev, ret, "Failed to allocate IRQ.\n"); st->clk = devm_clk_get_enabled(&pdev->dev, "adc_clk"); - if (IS_ERR(st->clk)) { - dev_err(&pdev->dev, - "Could not prepare or enable the clock.\n"); - ret = PTR_ERR(st->clk); - return ret; - } + if (IS_ERR(st->clk)) + return dev_err_probe(&pdev->dev, PTR_ERR(st->clk), + "Could not prepare or enable the clock.\n"); st->adc_clk = devm_clk_get_enabled(&pdev->dev, "adc_op_clk"); - if (IS_ERR(st->adc_clk)) { - dev_err(&pdev->dev, - "Could not prepare or enable the ADC clock.\n"); - ret = PTR_ERR(st->adc_clk); - return ret; - } + if (IS_ERR(st->adc_clk)) + return dev_err_probe(&pdev->dev, PTR_ERR(st->adc_clk), + "Could not prepare or enable the ADC clock.\n"); /* * Prescaler rate computation using the formula from the Atmel's @@ -1119,10 +1107,8 @@ static int at91_adc_probe(struct platform_device *pdev) prsc = (mstrclk / (2 * adc_clk)) - 1; - if (!st->startup_time) { - dev_err(&pdev->dev, "No startup time available.\n"); - return -EINVAL; - } + if (!st->startup_time) + return dev_err_probe(&pdev->dev, -EINVAL, "No startup time available.\n"); ticks = (*st->caps->calc_startup_ticks)(st->startup_time, adc_clk_khz); /* @@ -1147,10 +1133,8 @@ static int at91_adc_probe(struct platform_device *pdev) /* Setup the ADC channels available on the board */ ret = at91_adc_channel_init(idev); - if (ret < 0) { - dev_err(&pdev->dev, "Couldn't initialize the channels.\n"); - return ret; - } + if (ret < 0) + return dev_err_probe(&pdev->dev, ret, "Couldn't initialize the channels.\n"); init_waitqueue_head(&st->wq_data_avail); mutex_init(&st->lock); @@ -1162,10 +1146,9 @@ static int at91_adc_probe(struct platform_device *pdev) */ if (!st->touchscreen_type) { ret = at91_adc_buffer_init(idev); - if (ret < 0) { - dev_err(&pdev->dev, "Couldn't initialize the buffer.\n"); - return ret; - } + if (ret < 0) + return dev_err_probe(&pdev->dev, ret, + "Couldn't initialize the buffer.\n"); ret = at91_adc_trigger_init(idev); if (ret < 0) {