Commit 892de703 authored by Jinjie Ruan's avatar Jinjie Ruan Committed by Jonathan Cameron

iio: adc: at91_adc: Use devm_clk_get_enabled() helper function

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: default avatarJinjie Ruan <ruanjinjie@huawei.com>
Link: https://lore.kernel.org/r/20230828064546.2383857-3-ruanjinjie@huawei.comSigned-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 449635ec
...@@ -1089,31 +1089,18 @@ static int at91_adc_probe(struct platform_device *pdev) ...@@ -1089,31 +1089,18 @@ static int at91_adc_probe(struct platform_device *pdev)
return ret; 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)) { if (IS_ERR(st->clk)) {
dev_err(&pdev->dev, "Failed to get the clock.\n");
return PTR_ERR(st->clk);
}
ret = clk_prepare_enable(st->clk);
if (ret) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"Could not prepare or enable the clock.\n"); "Could not prepare or enable the clock.\n");
return ret; return PTR_ERR(st->clk);
} }
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)) { 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, dev_err(&pdev->dev,
"Could not prepare or enable the ADC clock.\n"); "Could not prepare or enable the ADC clock.\n");
goto error_disable_clk; return PTR_ERR(st->adc_clk);
} }
/* /*
...@@ -1132,8 +1119,7 @@ static int at91_adc_probe(struct platform_device *pdev) ...@@ -1132,8 +1119,7 @@ static int at91_adc_probe(struct platform_device *pdev)
if (!st->startup_time) { if (!st->startup_time) {
dev_err(&pdev->dev, "No startup time available.\n"); dev_err(&pdev->dev, "No startup time available.\n");
ret = -EINVAL; return -EINVAL;
goto error_disable_adc_clk;
} }
ticks = (*st->caps->calc_startup_ticks)(st->startup_time, adc_clk_khz); ticks = (*st->caps->calc_startup_ticks)(st->startup_time, adc_clk_khz);
...@@ -1161,7 +1147,7 @@ static int at91_adc_probe(struct platform_device *pdev) ...@@ -1161,7 +1147,7 @@ static int at91_adc_probe(struct platform_device *pdev)
ret = at91_adc_channel_init(idev); ret = at91_adc_channel_init(idev);
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "Couldn't initialize the channels.\n"); dev_err(&pdev->dev, "Couldn't initialize the channels.\n");
goto error_disable_adc_clk; return ret;
} }
init_waitqueue_head(&st->wq_data_avail); init_waitqueue_head(&st->wq_data_avail);
...@@ -1176,19 +1162,19 @@ static int at91_adc_probe(struct platform_device *pdev) ...@@ -1176,19 +1162,19 @@ static int at91_adc_probe(struct platform_device *pdev)
ret = at91_adc_buffer_init(idev); ret = at91_adc_buffer_init(idev);
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "Couldn't initialize the buffer.\n"); dev_err(&pdev->dev, "Couldn't initialize the buffer.\n");
goto error_disable_adc_clk; return ret;
} }
ret = at91_adc_trigger_init(idev); ret = at91_adc_trigger_init(idev);
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "Couldn't setup the triggers.\n"); dev_err(&pdev->dev, "Couldn't setup the triggers.\n");
at91_adc_buffer_remove(idev); at91_adc_buffer_remove(idev);
goto error_disable_adc_clk; return ret;
} }
} else { } else {
ret = at91_ts_register(idev, pdev); ret = at91_ts_register(idev, pdev);
if (ret) if (ret)
goto error_disable_adc_clk; return ret;
at91_ts_hw_init(idev, adc_clk_khz); at91_ts_hw_init(idev, adc_clk_khz);
} }
...@@ -1208,10 +1194,6 @@ static int at91_adc_probe(struct platform_device *pdev) ...@@ -1208,10 +1194,6 @@ static int at91_adc_probe(struct platform_device *pdev)
} else { } else {
at91_ts_unregister(st); at91_ts_unregister(st);
} }
error_disable_adc_clk:
clk_disable_unprepare(st->adc_clk);
error_disable_clk:
clk_disable_unprepare(st->clk);
return ret; return ret;
} }
...@@ -1227,8 +1209,6 @@ static int at91_adc_remove(struct platform_device *pdev) ...@@ -1227,8 +1209,6 @@ static int at91_adc_remove(struct platform_device *pdev)
} else { } else {
at91_ts_unregister(st); at91_ts_unregister(st);
} }
clk_disable_unprepare(st->adc_clk);
clk_disable_unprepare(st->clk);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment