From: Bartosz Golaszewski <brgl@bgdev.pl> To: Jonathan Cameron <jic23@kernel.org>, Lars-Peter Clausen <lars@metafoo.de>, Peter Meerwald-Stadler <pmeerw@pmeerw.net>, Michal Simek <michal.simek@xilinx.com> Cc: linux-iio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski <bgolaszewski@baylibre.com> Subject: [PATCH 3/5] iio: adc: xilinx: use a devres action to disable and unprepare the clock Date: Mon, 26 Oct 2020 14:36:07 +0100 [thread overview] Message-ID: <20201026133609.24262-4-brgl@bgdev.pl> (raw) In-Reply-To: <20201026133609.24262-1-brgl@bgdev.pl> From: Bartosz Golaszewski <bgolaszewski@baylibre.com> In order to simplify resource management and error paths in probe(), add a devm action that calls clk_disable_unprepare() at driver detach. Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> --- drivers/iio/adc/xilinx-xadc-core.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/iio/adc/xilinx-xadc-core.c b/drivers/iio/adc/xilinx-xadc-core.c index b516280ccbd4..e0da6258092c 100644 --- a/drivers/iio/adc/xilinx-xadc-core.c +++ b/drivers/iio/adc/xilinx-xadc-core.c @@ -1185,6 +1185,13 @@ static int xadc_parse_dt(struct iio_dev *indio_dev, struct device_node *np, return 0; } +static void xadc_clk_disable_unprepare(void *data) +{ + struct clk *clk = data; + + clk_disable_unprepare(clk); +} + static int xadc_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -1262,6 +1269,11 @@ static int xadc_probe(struct platform_device *pdev) if (ret) goto err_free_samplerate_trigger; + ret = devm_add_action_or_reset(dev, + xadc_clk_disable_unprepare, xadc->clk); + if (ret) + goto err_free_samplerate_trigger; + /* * Make sure not to exceed the maximum samplerate since otherwise the * resulting interrupt storm will soft-lock the system. @@ -1280,7 +1292,7 @@ static int xadc_probe(struct platform_device *pdev) ret = request_irq(xadc->irq, xadc->ops->interrupt_handler, 0, dev_name(dev), indio_dev); if (ret) - goto err_clk_disable_unprepare; + goto err_free_samplerate_trigger; ret = xadc->ops->setup(pdev, indio_dev, xadc->irq); if (ret) @@ -1344,8 +1356,6 @@ static int xadc_probe(struct platform_device *pdev) err_free_irq: free_irq(xadc->irq, indio_dev); cancel_delayed_work_sync(&xadc->zynq_unmask_work); -err_clk_disable_unprepare: - clk_disable_unprepare(xadc->clk); err_free_samplerate_trigger: if (xadc->ops->flags & XADC_FLAGS_BUFFERED) iio_trigger_free(xadc->samplerate_trigger); @@ -1372,7 +1382,6 @@ static int xadc_remove(struct platform_device *pdev) } free_irq(xadc->irq, indio_dev); cancel_delayed_work_sync(&xadc->zynq_unmask_work); - clk_disable_unprepare(xadc->clk); return 0; } -- 2.29.1
WARNING: multiple messages have this Message-ID (diff)
From: Bartosz Golaszewski <brgl@bgdev.pl> To: Jonathan Cameron <jic23@kernel.org>, Lars-Peter Clausen <lars@metafoo.de>, Peter Meerwald-Stadler <pmeerw@pmeerw.net>, Michal Simek <michal.simek@xilinx.com> Cc: linux-iio@vger.kernel.org, Bartosz Golaszewski <bgolaszewski@baylibre.com>, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 3/5] iio: adc: xilinx: use a devres action to disable and unprepare the clock Date: Mon, 26 Oct 2020 14:36:07 +0100 [thread overview] Message-ID: <20201026133609.24262-4-brgl@bgdev.pl> (raw) In-Reply-To: <20201026133609.24262-1-brgl@bgdev.pl> From: Bartosz Golaszewski <bgolaszewski@baylibre.com> In order to simplify resource management and error paths in probe(), add a devm action that calls clk_disable_unprepare() at driver detach. Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> --- drivers/iio/adc/xilinx-xadc-core.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/iio/adc/xilinx-xadc-core.c b/drivers/iio/adc/xilinx-xadc-core.c index b516280ccbd4..e0da6258092c 100644 --- a/drivers/iio/adc/xilinx-xadc-core.c +++ b/drivers/iio/adc/xilinx-xadc-core.c @@ -1185,6 +1185,13 @@ static int xadc_parse_dt(struct iio_dev *indio_dev, struct device_node *np, return 0; } +static void xadc_clk_disable_unprepare(void *data) +{ + struct clk *clk = data; + + clk_disable_unprepare(clk); +} + static int xadc_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -1262,6 +1269,11 @@ static int xadc_probe(struct platform_device *pdev) if (ret) goto err_free_samplerate_trigger; + ret = devm_add_action_or_reset(dev, + xadc_clk_disable_unprepare, xadc->clk); + if (ret) + goto err_free_samplerate_trigger; + /* * Make sure not to exceed the maximum samplerate since otherwise the * resulting interrupt storm will soft-lock the system. @@ -1280,7 +1292,7 @@ static int xadc_probe(struct platform_device *pdev) ret = request_irq(xadc->irq, xadc->ops->interrupt_handler, 0, dev_name(dev), indio_dev); if (ret) - goto err_clk_disable_unprepare; + goto err_free_samplerate_trigger; ret = xadc->ops->setup(pdev, indio_dev, xadc->irq); if (ret) @@ -1344,8 +1356,6 @@ static int xadc_probe(struct platform_device *pdev) err_free_irq: free_irq(xadc->irq, indio_dev); cancel_delayed_work_sync(&xadc->zynq_unmask_work); -err_clk_disable_unprepare: - clk_disable_unprepare(xadc->clk); err_free_samplerate_trigger: if (xadc->ops->flags & XADC_FLAGS_BUFFERED) iio_trigger_free(xadc->samplerate_trigger); @@ -1372,7 +1382,6 @@ static int xadc_remove(struct platform_device *pdev) } free_irq(xadc->irq, indio_dev); cancel_delayed_work_sync(&xadc->zynq_unmask_work); - clk_disable_unprepare(xadc->clk); return 0; } -- 2.29.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-10-26 13:36 UTC|newest] Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-10-26 13:36 [PATCH 0/5] iio: adc: xilinx: use even more devres Bartosz Golaszewski 2020-10-26 13:36 ` Bartosz Golaszewski 2020-10-26 13:36 ` [PATCH 1/5] iio: adc: xilinx: use helper variable for &pdev->dev Bartosz Golaszewski 2020-10-26 13:36 ` Bartosz Golaszewski 2020-10-26 13:36 ` [PATCH 2/5] iio: adc: xilinx: use devm_krealloc() instead of kfree() + kcalloc() Bartosz Golaszewski 2020-10-26 13:36 ` Bartosz Golaszewski 2020-10-27 9:33 ` Andy Shevchenko 2020-10-27 9:33 ` Andy Shevchenko 2020-10-27 10:04 ` Bartosz Golaszewski 2020-10-27 10:04 ` Bartosz Golaszewski 2020-10-27 10:30 ` Andy Shevchenko 2020-10-27 10:30 ` Andy Shevchenko 2020-10-27 10:40 ` Bartosz Golaszewski 2020-10-27 10:40 ` Bartosz Golaszewski 2020-10-27 11:18 ` Andy Shevchenko 2020-10-27 11:18 ` Andy Shevchenko 2020-10-26 13:36 ` Bartosz Golaszewski [this message] 2020-10-26 13:36 ` [PATCH 3/5] iio: adc: xilinx: use a devres action to disable and unprepare the clock Bartosz Golaszewski 2020-10-29 15:38 ` Jonathan Cameron 2020-10-29 15:38 ` Jonathan Cameron 2020-10-26 13:36 ` [PATCH 4/5] iio: adc: xilinx: use devres for irq handling Bartosz Golaszewski 2020-10-26 13:36 ` Bartosz Golaszewski 2020-10-29 15:41 ` Jonathan Cameron 2020-10-29 15:41 ` Jonathan Cameron 2020-10-30 10:52 ` Bartosz Golaszewski 2020-10-30 10:52 ` Bartosz Golaszewski 2020-10-31 11:10 ` Jonathan Cameron 2020-10-31 11:10 ` Jonathan Cameron 2020-11-02 8:39 ` Bartosz Golaszewski 2020-11-02 8:39 ` Bartosz Golaszewski 2020-10-26 13:36 ` [PATCH 5/5] iio: adc: xilinx: use iio devres helpers Bartosz Golaszewski 2020-10-26 13:36 ` Bartosz Golaszewski
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20201026133609.24262-4-brgl@bgdev.pl \ --to=brgl@bgdev.pl \ --cc=bgolaszewski@baylibre.com \ --cc=jic23@kernel.org \ --cc=lars@metafoo.de \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-iio@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=michal.simek@xilinx.com \ --cc=pmeerw@pmeerw.net \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.