From: Philipp Zabel <p.zabel@pengutronix.de>
To: Billy Tsai <billy_tsai@aspeedtech.com>,
jic23@kernel.org, lars@metafoo.de, pmeerw@pmeerw.net,
robh+dt@kernel.org, joel@jms.id.au, andrew@aj.id.au,
lgirdwood@gmail.com, broonie@kernel.org,
linux-iio@vger.kernel.org, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-aspeed@lists.ozlabs.org, linux-kernel@vger.kernel.org
Cc: BMC-SW@aspeedtech.com
Subject: Re: [v5 09/15] iio: adc: aspeed: Use devm_add_action_or_reset.
Date: Tue, 31 Aug 2021 09:51:23 +0200 [thread overview]
Message-ID: <4bc2bf196efd540933e6a781a44af20142e3d5d3.camel@pengutronix.de> (raw)
In-Reply-To: <20210831071458.2334-10-billy_tsai@aspeedtech.com>
Hi Billy,
On Tue, 2021-08-31 at 15:14 +0800, Billy Tsai wrote:
> This patch use devm_add_action_or_reset to handle the error in probe
> phase.
>
> Signed-off-by: Billy Tsai <billy_tsai@aspeedtech.com>
> ---
> drivers/iio/adc/aspeed_adc.c | 112 +++++++++++++++++++++--------------
> 1 file changed, 66 insertions(+), 46 deletions(-)
>
> diff --git a/drivers/iio/adc/aspeed_adc.c b/drivers/iio/adc/aspeed_adc.c
> index e53d1541ad1d..af00d9752c1e 100644
> --- a/drivers/iio/adc/aspeed_adc.c
> +++ b/drivers/iio/adc/aspeed_adc.c
[...]
> @@ -242,6 +271,11 @@ static int aspeed_adc_probe(struct platform_device *pdev)
> &data->clk_lock);
> if (IS_ERR(data->clk_prescaler))
> return PTR_ERR(data->clk_prescaler);
> + ret = devm_add_action_or_reset(data->dev,
> + aspeed_adc_unregister_divider,
> + data->clk_prescaler);
> + if (ret)
> + return ret;
I think here you could switch to devm_clk_hw_register_divider() instead.
> snprintf(clk_parent_name, ARRAY_SIZE(clk_parent_name),
> clk_name);
> scaler_flags = CLK_SET_RATE_PARENT;
> @@ -256,23 +290,30 @@ static int aspeed_adc_probe(struct platform_device *pdev)
> &pdev->dev, clk_name, clk_parent_name, scaler_flags,
> data->base + ASPEED_REG_CLOCK_CONTROL, 0,
> data->model_data->scaler_bit_width, 0, &data->clk_lock);
> - if (IS_ERR(data->clk_scaler)) {
> - ret = PTR_ERR(data->clk_scaler);
> - goto scaler_error;
> - }
> + if (IS_ERR(data->clk_scaler))
> + return PTR_ERR(data->clk_scaler);
> +
> + ret = devm_add_action_or_reset(data->dev, aspeed_adc_unregister_divider,
> + data->clk_scaler);
> + if (ret)
> + return ret;
Same as above.
[...]
> @@ -281,6 +322,10 @@ static int aspeed_adc_probe(struct platform_device *pdev)
> ASPEED_ADC_ENGINE_ENABLE,
> data->base + ASPEED_REG_ENGINE_CONTROL);
>
> + ret = devm_add_action_or_reset(data->dev, aspeed_adc_power_down,
> + data);
> + if (ret)
> + return ret;
> /* Wait for initial sequence complete. */
> ret = readl_poll_timeout(data->base + ASPEED_REG_ENGINE_CONTROL,
> adc_engine_control_reg_val,
[...]
> @@ -303,6 +354,11 @@ static int aspeed_adc_probe(struct platform_device *pdev)
> ASPEED_ADC_ENGINE_ENABLE;
> writel(adc_engine_control_reg_val,
> data->base + ASPEED_REG_ENGINE_CONTROL);
> + ret = devm_add_action_or_reset(data->dev,
> + aspeed_adc_power_down,
> + data);
> + if (ret)
> + return ret;
Should this be if (!model_dta->wait_init_sequence) ? Otherwise it looks
like you've already registered the same aspeed_adc_power_down action
above.
regards
Philipp
next prev parent reply other threads:[~2021-08-31 7:51 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-31 7:14 [v5 00/15] Add support for ast2600 ADC Billy Tsai
2021-08-31 7:14 ` [v5 01/15] iio: adc: aspeed: set driver data when adc probe Billy Tsai
2021-09-05 14:25 ` Jonathan Cameron
2021-08-31 7:14 ` [v5 02/15] dt-bindings: iio: adc: Add ast2600-adc bindings Billy Tsai
2021-09-01 1:38 ` Rob Herring
2021-09-05 14:27 ` Jonathan Cameron
2021-08-31 7:14 ` [v5 03/15] iio: adc: aspeed: completes the bitfield declare Billy Tsai
2021-09-05 14:30 ` Jonathan Cameron
2021-08-31 7:14 ` [v5 04/15] iio: adc: aspeed: Keep model data to driver data Billy Tsai
2021-09-05 14:33 ` Jonathan Cameron
2021-09-05 14:50 ` Jonathan Cameron
2021-09-16 3:52 ` Joel Stanley
2021-09-18 17:55 ` Jonathan Cameron
2021-08-31 7:14 ` [v5 05/15] iio: adc: aspeed: Refactory model data structure Billy Tsai
2021-09-05 14:37 ` Jonathan Cameron
2021-08-31 7:14 ` [v5 06/15] iio: adc: aspeed: Add vref config function Billy Tsai
2021-08-31 7:14 ` [v5 07/15] iio: adc: aspeed: Set num_channels with model data Billy Tsai
2021-08-31 7:14 ` [v5 08/15] iio: adc: aspeed: Use model_data to set clk scaler Billy Tsai
2021-08-31 7:14 ` [v5 09/15] iio: adc: aspeed: Use devm_add_action_or_reset Billy Tsai
2021-08-31 7:51 ` Philipp Zabel [this message]
2021-08-31 7:14 ` [v5 10/15] iio: adc: aspeed: Support ast2600 adc Billy Tsai
2021-08-31 7:14 ` [v5 11/15] iio: adc: aspeed: Fix the calculate error of clock Billy Tsai
2021-09-05 14:47 ` Jonathan Cameron
2021-08-31 7:14 ` [v5 12/15] iio: adc: aspeed: Add func to set sampling rate Billy Tsai
2021-08-31 7:14 ` [v5 13/15] iio: adc: aspeed: Add compensation phase Billy Tsai
2021-08-31 7:14 ` [v5 14/15] iio: adc: aspeed: Support battery sensing Billy Tsai
2021-08-31 7:14 ` [v5 15/15] iio: adc: aspeed: Get and set trimming data Billy Tsai
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=4bc2bf196efd540933e6a781a44af20142e3d5d3.camel@pengutronix.de \
--to=p.zabel@pengutronix.de \
--cc=BMC-SW@aspeedtech.com \
--cc=andrew@aj.id.au \
--cc=billy_tsai@aspeedtech.com \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=jic23@kernel.org \
--cc=joel@jms.id.au \
--cc=lars@metafoo.de \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-aspeed@lists.ozlabs.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pmeerw@pmeerw.net \
--cc=robh+dt@kernel.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).