[PATCH -next 3/4] iio: adc: spear_adc: Use devm_clk_get_enabled() helper function

[Jonathan Cameron]

On Fri, 25 Aug 2023 18:57:45 +0800
Jinjie Ruan <ruanjinjie at huawei.com> wrote:

> 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: Jinjie Ruan <ruanjinjie at huawei.com>
Also switch to devm_iio_device_register() and drop the remove function.

Jonathan

> ---
>  drivers/iio/adc/spear_adc.c | 30 +++++++-----------------------
>  1 file changed, 7 insertions(+), 23 deletions(-)
> 
> diff --git a/drivers/iio/adc/spear_adc.c b/drivers/iio/adc/spear_adc.c
> index ad54ef798109..cd7708aa95af 100644
> --- a/drivers/iio/adc/spear_adc.c
> +++ b/drivers/iio/adc/spear_adc.c
> @@ -297,36 +297,27 @@ static int spear_adc_probe(struct platform_device *pdev)
>  	st->adc_base_spear3xx =
>  		(struct adc_regs_spear3xx __iomem *)st->adc_base_spear6xx;
>  
> -	st->clk = devm_clk_get(dev, NULL);
> +	st->clk = devm_clk_get_enabled(dev, NULL);
>  	if (IS_ERR(st->clk)) {
> -		dev_err(dev, "failed getting clock\n");
> -		return PTR_ERR(st->clk);
> -	}
> -
> -	ret = clk_prepare_enable(st->clk);
> -	if (ret) {
>  		dev_err(dev, "failed enabling clock\n");
> -		return ret;
> +		return PTR_ERR(st->clk);
>  	}
>  
>  	irq = platform_get_irq(pdev, 0);
> -	if (irq < 0) {
> -		ret = irq;
> -		goto errout2;
> -	}
> +	if (irq < 0)
> +		return irq;
>  
>  	ret = devm_request_irq(dev, irq, spear_adc_isr, 0, SPEAR_ADC_MOD_NAME,
>  			       st);
>  	if (ret < 0) {
>  		dev_err(dev, "failed requesting interrupt\n");
> -		goto errout2;
> +		return ret;
>  	}
>  
>  	if (of_property_read_u32(np, "sampling-frequency",
>  				 &st->sampling_freq)) {
>  		dev_err(dev, "sampling-frequency missing in DT\n");
> -		ret = -EINVAL;
> -		goto errout2;
> +		return -EINVAL;
>  	}
>  
>  	/*
> @@ -355,24 +346,17 @@ static int spear_adc_probe(struct platform_device *pdev)
>  
>  	ret = iio_device_register(indio_dev);
>  	if (ret)
> -		goto errout2;
> +		return ret;
>  
>  	dev_info(dev, "SPEAR ADC driver loaded, IRQ %d\n", irq);
>  
>  	return 0;
> -
> -errout2:
> -	clk_disable_unprepare(st->clk);
> -	return ret;
>  }
>  
>  static int spear_adc_remove(struct platform_device *pdev)
>  {
>  	struct iio_dev *indio_dev = platform_get_drvdata(pdev);
> -	struct spear_adc_state *st = iio_priv(indio_dev);
> -
>  	iio_device_unregister(indio_dev);
> -	clk_disable_unprepare(st->clk);
>  
>  	return 0;
>  }