Re: [v5 09/15] iio: adc: aspeed: Use devm_add_action_or_reset.
From: Philipp Zabel <p.zabel@pengutronix.de>
Date: 2021-08-31 07:51:52
Also in:
linux-arm-kernel, linux-aspeed, linux-devicetree, lkml
Hi Billy, On Tue, 2021-08-31 at 15:14 +0800, Billy Tsai wrote:
quoted hunk ↗ jump to hunk
This patch use devm_add_action_or_reset to handle the error in probe phase. Signed-off-by: Billy Tsai <redacted> --- 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
[...]
quoted hunk ↗ jump to hunk
@@ -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.
quoted hunk ↗ jump to hunk
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. [...]
quoted hunk ↗ jump to hunk
@@ -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,
[...]
quoted hunk ↗ jump to hunk
@@ -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