[PATCH v4 1/2] iio: adc: vf610_adc: use devm_* and dev_err_probe() to simple code

[PATCH v4 1/2] iio: adc: vf610_adc: use devm_* and dev_err_probe() to simple code

[Frank Li]

Use devm_* and dev_err_probe() simplify probe function and remove
vf610_adc_remove().

Reviewed-by: Haibo Chen <haibo.chen@nxp.com>
Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
Change from v3 to v4
- keep vref_uv as u32
- keep original regulator part and only add
devm_add_action_or_reset(&pdev->dev, vf610_adc_remove, info)

Change from v2 to v3
- change vref_uv to int from u32 to fix below warning
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202411070633.NIrO7Ert-lkp@intel.com/
smatch warnings:
drivers/iio/adc/vf610_adc.c:857 vf610_adc_probe() warn: unsigned 'info->vref_uv' is never less than zero.

vim +857 drivers/iio/adc/vf610_adc.c

Change from v1 to v2
- add Haibo's review tag
---
 drivers/iio/adc/vf610_adc.c | 79 ++++++++++++-------------------------
 1 file changed, 26 insertions(+), 53 deletions(-)

diff --git a/drivers/iio/adc/vf610_adc.c b/drivers/iio/adc/vf610_adc.c
index 4d83c12975c53..d4b778799755b 100644
--- a/drivers/iio/adc/vf610_adc.c
+++ b/drivers/iio/adc/vf610_adc.c
@@ -814,6 +814,14 @@ static const struct of_device_id vf610_adc_match[] = {
 };
 MODULE_DEVICE_TABLE(of, vf610_adc_match);
 
+static void vf610_adc_action_remove(void *d)
+{
+	struct vf610_adc *info = d;
+
+	if (info->vref)
+		regulator_disable(info->vref);
+}
+
 static int vf610_adc_probe(struct platform_device *pdev)
 {
 	struct device *dev = &pdev->dev;
@@ -823,10 +831,8 @@ static int vf610_adc_probe(struct platform_device *pdev)
 	int ret;
 
 	indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(struct vf610_adc));
-	if (!indio_dev) {
-		dev_err(&pdev->dev, "Failed allocating iio device\n");
-		return -ENOMEM;
-	}
+	if (!indio_dev)
+		return dev_err_probe(&pdev->dev, -ENOMEM, "Failed allocating iio device\n");
 
 	info = iio_priv(indio_dev);
 	info->dev = &pdev->dev;
@@ -842,17 +848,12 @@ static int vf610_adc_probe(struct platform_device *pdev)
 	ret = devm_request_irq(info->dev, irq,
 				vf610_adc_isr, 0,
 				dev_name(&pdev->dev), indio_dev);
-	if (ret < 0) {
-		dev_err(&pdev->dev, "failed requesting irq, irq = %d\n", irq);
-		return ret;
-	}
+	if (ret < 0)
+		return dev_err_probe(&pdev->dev, ret, "failed requesting irq, irq = %d\n", irq);
 
-	info->clk = devm_clk_get(&pdev->dev, "adc");
-	if (IS_ERR(info->clk)) {
-		dev_err(&pdev->dev, "failed getting clock, err = %ld\n",
-						PTR_ERR(info->clk));
-		return PTR_ERR(info->clk);
-	}
+	info->clk = devm_clk_get_enabled(&pdev->dev, "adc");
+	if (IS_ERR(info->clk))
+		return dev_err_probe(&pdev->dev, PTR_ERR(info->clk), "failed getting clock\n");
 
 	info->vref = devm_regulator_get(&pdev->dev, "vref");
 	if (IS_ERR(info->vref))
@@ -862,6 +863,10 @@ static int vf610_adc_probe(struct platform_device *pdev)
 	if (ret)
 		return ret;
 
+	ret = devm_add_action_or_reset(&pdev->dev, vf610_adc_action_remove, info);
+	if (ret)
+		return ret;
+
 	info->vref_uv = regulator_get_voltage(info->vref);
 
 	device_property_read_u32_array(dev, "fsl,adck-max-frequency", info->max_adck_rate, 3);
@@ -879,52 +884,21 @@ static int vf610_adc_probe(struct platform_device *pdev)
 	indio_dev->channels = vf610_adc_iio_channels;
 	indio_dev->num_channels = ARRAY_SIZE(vf610_adc_iio_channels);
 
-	ret = clk_prepare_enable(info->clk);
-	if (ret) {
-		dev_err(&pdev->dev,
-			"Could not prepare or enable the clock.\n");
-		goto error_adc_clk_enable;
-	}
-
 	vf610_adc_cfg_init(info);
 	vf610_adc_hw_init(info);
 
-	ret = iio_triggered_buffer_setup(indio_dev, &iio_pollfunc_store_time,
-					NULL, &iio_triggered_buffer_setup_ops);
-	if (ret < 0) {
-		dev_err(&pdev->dev, "Couldn't initialise the buffer\n");
-		goto error_iio_device_register;
-	}
+	ret = devm_iio_triggered_buffer_setup(&pdev->dev, indio_dev, &iio_pollfunc_store_time,
+					      NULL, &iio_triggered_buffer_setup_ops);
+	if (ret < 0)
+		return dev_err_probe(&pdev->dev, ret, "Couldn't initialise the buffer\n");
 
 	mutex_init(&info->lock);
 
-	ret = iio_device_register(indio_dev);
-	if (ret) {
-		dev_err(&pdev->dev, "Couldn't register the device.\n");
-		goto error_adc_buffer_init;
-	}
+	ret = devm_iio_device_register(&pdev->dev, indio_dev);
+	if (ret)
+		return dev_err_probe(&pdev->dev, ret, "Couldn't register the device.\n");
 
 	return 0;
-
-error_adc_buffer_init:
-	iio_triggered_buffer_cleanup(indio_dev);
-error_iio_device_register:
-	clk_disable_unprepare(info->clk);
-error_adc_clk_enable:
-	regulator_disable(info->vref);
-
-	return ret;
-}
-
-static void vf610_adc_remove(struct platform_device *pdev)
-{
-	struct iio_dev *indio_dev = platform_get_drvdata(pdev);
-	struct vf610_adc *info = iio_priv(indio_dev);
-
-	iio_device_unregister(indio_dev);
-	iio_triggered_buffer_cleanup(indio_dev);
-	regulator_disable(info->vref);
-	clk_disable_unprepare(info->clk);
 }
 
 static int vf610_adc_suspend(struct device *dev)
@@ -972,7 +946,6 @@ static DEFINE_SIMPLE_DEV_PM_OPS(vf610_adc_pm_ops, vf610_adc_suspend,
 
 static struct platform_driver vf610_adc_driver = {
 	.probe          = vf610_adc_probe,
-	.remove         = vf610_adc_remove,
 	.driver         = {
 		.name   = DRIVER_NAME,
 		.of_match_table = vf610_adc_match,
-- 
2.34.1

[PATCH v4 2/2] iio: adc: vf610_adc: limit i.MX6SX's channel number to 4

[Frank Li]

i.MX6SX only has 4 ADC channels, so limit channel numbers to 4 for
compatible string 'fsl,imx6sx-adc'.

Reviewed-by: Haibo Chen <haibo.chen@nxp.com>
Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
compatible string 'fsl,imx6sx-adc' already document in
Documentation/devicetree/bindings/iio/adc/fsl,vf610-adc.yaml
Change from v3 to v4
- Add struct vf610_chip_info to avoid cast int to void*

Change from v2 to v3
- none

Change from v1 to v2
- Add Haibo Chen <haibo.chen@nxp.com>
- change cast to uintptr_t to fix below warning

| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202411052345.gyJaM3h4-lkp@intel.com/
All warnings (new ones prefixed by >>):

   In file included from drivers/iio/adc/vf610_adc.c:20:   In file included from include/linux/regulator/consumer.h:35:
   In file included from include/linux/suspend.h:5:
   In file included from include/linux/swap.h:9:
   In file included from include/linux/memcontrol.h:21:
   In file included from include/linux/mm.h:2213:
   include/linux/vmstat.h:518:36: warning: arithmetic between different enumeration types ('enum node_stat_item' and 'enum lru_list') [-Wenum-enum-conversion]
     518 |         return node_stat_name(NR_LRU_BASE + lru) + 3; // skip "nr_"
         |                               ~~~~~~~~~~~ ^ ~~~>> drivers/iio/adc/vf610_adc.c:874:28: warning: cast to smaller integer type 'u32' (aka 'unsigned int') from 'const void *' [-Wvoid-pointer-to-int-cast]
     874 |         indio_dev->num_channels = (u32)device_get_match_data(dev);
         |
---
 drivers/iio/adc/vf610_adc.c | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/drivers/iio/adc/vf610_adc.c b/drivers/iio/adc/vf610_adc.c
index d4b778799755b..6f66bd7ff8eca 100644
--- a/drivers/iio/adc/vf610_adc.c
+++ b/drivers/iio/adc/vf610_adc.c
@@ -177,6 +177,10 @@ struct vf610_adc {
 	} scan;
 };
 
+struct vf610_chip_info {
+	u8 num_channels;
+};
+
 static const u32 vf610_hw_avgs[] = { 1, 4, 8, 16, 32 };
 static const u32 vf610_lst_adder[] = { 3, 5, 7, 9, 13, 17, 21, 25 };
 
@@ -808,8 +812,17 @@ static const struct iio_info vf610_adc_iio_info = {
 	.attrs = &vf610_attribute_group,
 };
 
+static const struct vf610_chip_info vf610_chip_info = {
+	.num_channels = ARRAY_SIZE(vf610_adc_iio_channels),
+};
+
+static const struct vf610_chip_info imx6sx_chip_info = {
+	.num_channels = 4,
+};
+
 static const struct of_device_id vf610_adc_match[] = {
-	{ .compatible = "fsl,vf610-adc", },
+	{ .compatible = "fsl,imx6sx-adc", .data = &imx6sx_chip_info},
+	{ .compatible = "fsl,vf610-adc", .data = &vf610_chip_info},
 	{ /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, vf610_adc_match);
@@ -824,6 +837,7 @@ static void vf610_adc_action_remove(void *d)
 
 static int vf610_adc_probe(struct platform_device *pdev)
 {
+	const struct vf610_chip_info *chip_info;
 	struct device *dev = &pdev->dev;
 	struct vf610_adc *info;
 	struct iio_dev *indio_dev;
@@ -841,6 +855,10 @@ static int vf610_adc_probe(struct platform_device *pdev)
 	if (IS_ERR(info->regs))
 		return PTR_ERR(info->regs);
 
+	chip_info = device_get_match_data(dev);
+	if (!chip_info)
+		return -EINVAL;
+
 	irq = platform_get_irq(pdev, 0);
 	if (irq < 0)
 		return irq;
@@ -882,7 +900,7 @@ static int vf610_adc_probe(struct platform_device *pdev)
 	indio_dev->info = &vf610_adc_iio_info;
 	indio_dev->modes = INDIO_DIRECT_MODE;
 	indio_dev->channels = vf610_adc_iio_channels;
-	indio_dev->num_channels = ARRAY_SIZE(vf610_adc_iio_channels);
+	indio_dev->num_channels = chip_info->num_channels;
 
 	vf610_adc_cfg_init(info);
 	vf610_adc_hw_init(info);
-- 
2.34.1

Re: [PATCH v4 1/2] iio: adc: vf610_adc: use devm_* and dev_err_probe() to simple code

[Jonathan Cameron]

On Mon, 11 Nov 2024 16:38:58 -0500
Frank Li <Frank.Li@nxp.com> wrote:

> Use devm_* and dev_err_probe() simplify probe function and remove
> vf610_adc_remove().
> 
> Reviewed-by: Haibo Chen <haibo.chen@nxp.com>
> Signed-off-by: Frank Li <Frank.Li@nxp.com>
Hi Frank,

One (hopefully final) question inline.

Jonathan

> ---
> Change from v3 to v4
> - keep vref_uv as u32
> - keep original regulator part and only add
> devm_add_action_or_reset(&pdev->dev, vf610_adc_remove, info)
> 
> Change from v2 to v3
> - change vref_uv to int from u32 to fix below warning
> | Reported-by: kernel test robot <lkp@intel.com>
> | Closes: https://lore.kernel.org/oe-kbuild-all/202411070633.NIrO7Ert-lkp@intel.com/
> smatch warnings:
> drivers/iio/adc/vf610_adc.c:857 vf610_adc_probe() warn: unsigned 'info->vref_uv' is never less than zero.
> 
> vim +857 drivers/iio/adc/vf610_adc.c
> 
> Change from v1 to v2
> - add Haibo's review tag
> ---
>  drivers/iio/adc/vf610_adc.c | 79 ++++++++++++-------------------------
>  1 file changed, 26 insertions(+), 53 deletions(-)
> 
> diff --git a/drivers/iio/adc/vf610_adc.c b/drivers/iio/adc/vf610_adc.c
> index 4d83c12975c53..d4b778799755b 100644
> --- a/drivers/iio/adc/vf610_adc.c
> +++ b/drivers/iio/adc/vf610_adc.c
> @@ -814,6 +814,14 @@ static const struct of_device_id vf610_adc_match[] = {
>  };
>  MODULE_DEVICE_TABLE(of, vf610_adc_match);
>  
> +static void vf610_adc_action_remove(void *d)
> +{
> +	struct vf610_adc *info = d;
> +
> +	if (info->vref)
> +		regulator_disable(info->vref);

Why is the check on info->vref needed?
vref is required to reach the point where this callback is registered.

> +}
> +
>  static int vf610_adc_probe(struct platform_device *pdev)
>  {
>  	struct device *dev = &pdev->dev;
> @@ -823,10 +831,8 @@ static int vf610_adc_probe(struct platform_device *pdev)
>  	int ret;
>  
>  	indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(struct vf610_adc));
> -	if (!indio_dev) {
> -		dev_err(&pdev->dev, "Failed allocating iio device\n");
> -		return -ENOMEM;
> -	}
> +	if (!indio_dev)
> +		return dev_err_probe(&pdev->dev, -ENOMEM, "Failed allocating iio device\n");
>  
>  	info = iio_priv(indio_dev);
>  	info->dev = &pdev->dev;
> @@ -842,17 +848,12 @@ static int vf610_adc_probe(struct platform_device *pdev)
>  	ret = devm_request_irq(info->dev, irq,
>  				vf610_adc_isr, 0,
>  				dev_name(&pdev->dev), indio_dev);
> -	if (ret < 0) {
> -		dev_err(&pdev->dev, "failed requesting irq, irq = %d\n", irq);
> -		return ret;
> -	}
> +	if (ret < 0)
> +		return dev_err_probe(&pdev->dev, ret, "failed requesting irq, irq = %d\n", irq);
>  
> -	info->clk = devm_clk_get(&pdev->dev, "adc");
> -	if (IS_ERR(info->clk)) {
> -		dev_err(&pdev->dev, "failed getting clock, err = %ld\n",
> -						PTR_ERR(info->clk));
> -		return PTR_ERR(info->clk);
> -	}
> +	info->clk = devm_clk_get_enabled(&pdev->dev, "adc");
> +	if (IS_ERR(info->clk))
> +		return dev_err_probe(&pdev->dev, PTR_ERR(info->clk), "failed getting clock\n");
>  
>  	info->vref = devm_regulator_get(&pdev->dev, "vref");
>  	if (IS_ERR(info->vref))
> @@ -862,6 +863,10 @@ static int vf610_adc_probe(struct platform_device *pdev)
>  	if (ret)
>  		return ret;
>  
> +	ret = devm_add_action_or_reset(&pdev->dev, vf610_adc_action_remove, info);

As above, but this time if info->vref is not set, we have already returned so it 
must be set and doesn't need checking the callback.

> +	if (ret)
> +		return ret;
> +
>  	info->vref_uv = regulator_get_voltage(info->vref);
>  
>  	device_property_read_u32_array(dev, "fsl,adck-max-frequency", info->max_adck_rate, 3);
> @@ -879,52 +884,21 @@ static int vf610_adc_probe(struct platform_device *pdev)
>  	indio_dev->channels = vf610_adc_iio_channels;
>  	indio_dev->num_channels = ARRAY_SIZE(vf610_adc_iio_channels);
>  
> -	ret = clk_prepare_enable(info->clk);
> -	if (ret) {
> -		dev_err(&pdev->dev,
> -			"Could not prepare or enable the clock.\n");
> -		goto error_adc_clk_enable;
> -	}
> -
>  	vf610_adc_cfg_init(info);
>  	vf610_adc_hw_init(info);
>  
> -	ret = iio_triggered_buffer_setup(indio_dev, &iio_pollfunc_store_time,
> -					NULL, &iio_triggered_buffer_setup_ops);
> -	if (ret < 0) {
> -		dev_err(&pdev->dev, "Couldn't initialise the buffer\n");
> -		goto error_iio_device_register;
> -	}
> +	ret = devm_iio_triggered_buffer_setup(&pdev->dev, indio_dev, &iio_pollfunc_store_time,
> +					      NULL, &iio_triggered_buffer_setup_ops);
> +	if (ret < 0)
> +		return dev_err_probe(&pdev->dev, ret, "Couldn't initialise the buffer\n");
>  
>  	mutex_init(&info->lock);
>  
> -	ret = iio_device_register(indio_dev);
> -	if (ret) {
> -		dev_err(&pdev->dev, "Couldn't register the device.\n");
> -		goto error_adc_buffer_init;
> -	}
> +	ret = devm_iio_device_register(&pdev->dev, indio_dev);
> +	if (ret)
> +		return dev_err_probe(&pdev->dev, ret, "Couldn't register the device.\n");
>  
>  	return 0;
> -
> -error_adc_buffer_init:
> -	iio_triggered_buffer_cleanup(indio_dev);
> -error_iio_device_register:
> -	clk_disable_unprepare(info->clk);
> -error_adc_clk_enable:
> -	regulator_disable(info->vref);
> -
> -	return ret;
> -}
> -
> -static void vf610_adc_remove(struct platform_device *pdev)
> -{
> -	struct iio_dev *indio_dev = platform_get_drvdata(pdev);
> -	struct vf610_adc *info = iio_priv(indio_dev);
> -
> -	iio_device_unregister(indio_dev);
> -	iio_triggered_buffer_cleanup(indio_dev);
> -	regulator_disable(info->vref);
> -	clk_disable_unprepare(info->clk);
>  }
>  
>  static int vf610_adc_suspend(struct device *dev)
> @@ -972,7 +946,6 @@ static DEFINE_SIMPLE_DEV_PM_OPS(vf610_adc_pm_ops, vf610_adc_suspend,
>  
>  static struct platform_driver vf610_adc_driver = {
>  	.probe          = vf610_adc_probe,
> -	.remove         = vf610_adc_remove,
>  	.driver         = {
>  		.name   = DRIVER_NAME,
>  		.of_match_table = vf610_adc_match,

Re: [PATCH v4 1/2] iio: adc: vf610_adc: use devm_* and dev_err_probe() to simple code

[Frank Li]

On Sat, Nov 23, 2024 at 03:26:37PM +0000, Jonathan Cameron wrote:
> On Mon, 11 Nov 2024 16:38:58 -0500
> Frank Li <Frank.Li@nxp.com> wrote:
>
> > Use devm_* and dev_err_probe() simplify probe function and remove
> > vf610_adc_remove().
> >
> > Reviewed-by: Haibo Chen <haibo.chen@nxp.com>
> > Signed-off-by: Frank Li <Frank.Li@nxp.com>
> Hi Frank,
>
> One (hopefully final) question inline.
>
> Jonathan
>
> > ---
> > Change from v3 to v4
> > - keep vref_uv as u32
> > - keep original regulator part and only add
> > devm_add_action_or_reset(&pdev->dev, vf610_adc_remove, info)
> >
> > Change from v2 to v3
> > - change vref_uv to int from u32 to fix below warning
> > | Reported-by: kernel test robot <lkp@intel.com>
> > | Closes: https://lore.kernel.org/oe-kbuild-all/202411070633.NIrO7Ert-lkp@intel.com/
> > smatch warnings:
> > drivers/iio/adc/vf610_adc.c:857 vf610_adc_probe() warn: unsigned 'info->vref_uv' is never less than zero.
> >
> > vim +857 drivers/iio/adc/vf610_adc.c
> >
> > Change from v1 to v2
> > - add Haibo's review tag
> > ---
> >  drivers/iio/adc/vf610_adc.c | 79 ++++++++++++-------------------------
> >  1 file changed, 26 insertions(+), 53 deletions(-)
> >
> > diff --git a/drivers/iio/adc/vf610_adc.c b/drivers/iio/adc/vf610_adc.c
> > index 4d83c12975c53..d4b778799755b 100644
> > --- a/drivers/iio/adc/vf610_adc.c
> > +++ b/drivers/iio/adc/vf610_adc.c
> > @@ -814,6 +814,14 @@ static const struct of_device_id vf610_adc_match[] = {
> >  };
> >  MODULE_DEVICE_TABLE(of, vf610_adc_match);
> >
> > +static void vf610_adc_action_remove(void *d)
> > +{
> > +	struct vf610_adc *info = d;
> > +
> > +	if (info->vref)
> > +		regulator_disable(info->vref);
>
> Why is the check on info->vref needed?
> vref is required to reach the point where this callback is registered.
>
> > +}
> > +
> >  static int vf610_adc_probe(struct platform_device *pdev)
> >  {
> >  	struct device *dev = &pdev->dev;
> > @@ -823,10 +831,8 @@ static int vf610_adc_probe(struct platform_device *pdev)
> >  	int ret;
> >
> >  	indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(struct vf610_adc));
> > -	if (!indio_dev) {
> > -		dev_err(&pdev->dev, "Failed allocating iio device\n");
> > -		return -ENOMEM;
> > -	}
> > +	if (!indio_dev)
> > +		return dev_err_probe(&pdev->dev, -ENOMEM, "Failed allocating iio device\n");
> >
> >  	info = iio_priv(indio_dev);
> >  	info->dev = &pdev->dev;
> > @@ -842,17 +848,12 @@ static int vf610_adc_probe(struct platform_device *pdev)
> >  	ret = devm_request_irq(info->dev, irq,
> >  				vf610_adc_isr, 0,
> >  				dev_name(&pdev->dev), indio_dev);
> > -	if (ret < 0) {
> > -		dev_err(&pdev->dev, "failed requesting irq, irq = %d\n", irq);
> > -		return ret;
> > -	}
> > +	if (ret < 0)
> > +		return dev_err_probe(&pdev->dev, ret, "failed requesting irq, irq = %d\n", irq);
> >
> > -	info->clk = devm_clk_get(&pdev->dev, "adc");
> > -	if (IS_ERR(info->clk)) {
> > -		dev_err(&pdev->dev, "failed getting clock, err = %ld\n",
> > -						PTR_ERR(info->clk));
> > -		return PTR_ERR(info->clk);
> > -	}
> > +	info->clk = devm_clk_get_enabled(&pdev->dev, "adc");
> > +	if (IS_ERR(info->clk))
> > +		return dev_err_probe(&pdev->dev, PTR_ERR(info->clk), "failed getting clock\n");
> >
> >  	info->vref = devm_regulator_get(&pdev->dev, "vref");
> >  	if (IS_ERR(info->vref))
> > @@ -862,6 +863,10 @@ static int vf610_adc_probe(struct platform_device *pdev)
> >  	if (ret)
> >  		return ret;
> >
> > +	ret = devm_add_action_or_reset(&pdev->dev, vf610_adc_action_remove, info);
>
> As above, but this time if info->vref is not set, we have already returned so it
> must be set and doesn't need checking the callback.

Yes, you are right. Needn't check it at callback.

Frank
>
> > +	if (ret)
> > +		return ret;
> > +
> >  	info->vref_uv = regulator_get_voltage(info->vref);
> >
> >  	device_property_read_u32_array(dev, "fsl,adck-max-frequency", info->max_adck_rate, 3);
> > @@ -879,52 +884,21 @@ static int vf610_adc_probe(struct platform_device *pdev)
> >  	indio_dev->channels = vf610_adc_iio_channels;
> >  	indio_dev->num_channels = ARRAY_SIZE(vf610_adc_iio_channels);
> >
> > -	ret = clk_prepare_enable(info->clk);
> > -	if (ret) {
> > -		dev_err(&pdev->dev,
> > -			"Could not prepare or enable the clock.\n");
> > -		goto error_adc_clk_enable;
> > -	}
> > -
> >  	vf610_adc_cfg_init(info);
> >  	vf610_adc_hw_init(info);
> >
> > -	ret = iio_triggered_buffer_setup(indio_dev, &iio_pollfunc_store_time,
> > -					NULL, &iio_triggered_buffer_setup_ops);
> > -	if (ret < 0) {
> > -		dev_err(&pdev->dev, "Couldn't initialise the buffer\n");
> > -		goto error_iio_device_register;
> > -	}
> > +	ret = devm_iio_triggered_buffer_setup(&pdev->dev, indio_dev, &iio_pollfunc_store_time,
> > +					      NULL, &iio_triggered_buffer_setup_ops);
> > +	if (ret < 0)
> > +		return dev_err_probe(&pdev->dev, ret, "Couldn't initialise the buffer\n");
> >
> >  	mutex_init(&info->lock);
> >
> > -	ret = iio_device_register(indio_dev);
> > -	if (ret) {
> > -		dev_err(&pdev->dev, "Couldn't register the device.\n");
> > -		goto error_adc_buffer_init;
> > -	}
> > +	ret = devm_iio_device_register(&pdev->dev, indio_dev);
> > +	if (ret)
> > +		return dev_err_probe(&pdev->dev, ret, "Couldn't register the device.\n");
> >
> >  	return 0;
> > -
> > -error_adc_buffer_init:
> > -	iio_triggered_buffer_cleanup(indio_dev);
> > -error_iio_device_register:
> > -	clk_disable_unprepare(info->clk);
> > -error_adc_clk_enable:
> > -	regulator_disable(info->vref);
> > -
> > -	return ret;
> > -}
> > -
> > -static void vf610_adc_remove(struct platform_device *pdev)
> > -{
> > -	struct iio_dev *indio_dev = platform_get_drvdata(pdev);
> > -	struct vf610_adc *info = iio_priv(indio_dev);
> > -
> > -	iio_device_unregister(indio_dev);
> > -	iio_triggered_buffer_cleanup(indio_dev);
> > -	regulator_disable(info->vref);
> > -	clk_disable_unprepare(info->clk);
> >  }
> >
> >  static int vf610_adc_suspend(struct device *dev)
> > @@ -972,7 +946,6 @@ static DEFINE_SIMPLE_DEV_PM_OPS(vf610_adc_pm_ops, vf610_adc_suspend,
> >
> >  static struct platform_driver vf610_adc_driver = {
> >  	.probe          = vf610_adc_probe,
> > -	.remove         = vf610_adc_remove,
> >  	.driver         = {
> >  		.name   = DRIVER_NAME,
> >  		.of_match_table = vf610_adc_match,
>