On Sat, 26 Aug 2023 10:29:22 +0800
Jinjie Ruan <ruanjinjie@xxxxxxxxxx> wrote:
> 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 <ruanjinjie@xxxxxxxxxx>
As I've asked for other changes so there will probably be another version
anyway - a few trivial comments inline. Mostly you've hit the right balance
on line breaks, but there are a few more I'd like to see with the aim of
not going any longer than 80 chars than is necessary.
Thanks,
Jonathan
> ---
> 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");
Add a line break before the "
> 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");
Line break before "
>
> 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) {
