2022-08-31 10:21:42

by Vincent Whitchurch

Subject: [PATCH v2 4/5] iio: adc: mcp320x: use device managed functions

Use devm_* functions in probe to remove some code and to make it easier
to add further calls to the probe function.

Signed-off-by: Vincent Whitchurch <[email protected]>
---
drivers/iio/adc/mcp320x.c | 30 ++++++++++--------------------
1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/drivers/iio/adc/mcp320x.c b/drivers/iio/adc/mcp320x.c
index 8ed27df9a0bb..b1c1bf4b8047 100644
--- a/drivers/iio/adc/mcp320x.c
+++ b/drivers/iio/adc/mcp320x.c
@@ -390,6 +390,11 @@ static const struct mcp320x_chip_info mcp320x_chip_infos[] = {
},
};

+static void mcp320x_reg_disable(void *reg)
+{
+ regulator_disable(reg);
+}
+
static int mcp320x_probe(struct spi_device *spi)
{
struct iio_dev *indio_dev;
@@ -460,27 +465,13 @@ static int mcp320x_probe(struct spi_device *spi)
if (ret < 0)
return ret;

- mutex_init(&adc->lock);
-
- ret = iio_device_register(indio_dev);
- if (ret < 0)
- goto reg_disable;
-
- return 0;
-
-reg_disable:
- regulator_disable(adc->reg);
-
- return ret;
-}
+ ret = devm_add_action_or_reset(&spi->dev, mcp320x_reg_disable, adc->reg);
+ if (ret)
+ return ret;

-static void mcp320x_remove(struct spi_device *spi)
-{
- struct iio_dev *indio_dev = spi_get_drvdata(spi);
- struct mcp320x *adc = iio_priv(indio_dev);
+ mutex_init(&adc->lock);

- iio_device_unregister(indio_dev);
- regulator_disable(adc->reg);
+ return devm_iio_device_register(&spi->dev, indio_dev);
}

static const struct of_device_id mcp320x_dt_ids[] = {
@@ -535,7 +526,6 @@ static struct spi_driver mcp320x_driver = {
.of_match_table = mcp320x_dt_ids,
},
.probe = mcp320x_probe,
- .remove = mcp320x_remove,
.id_table = mcp320x_id,
};
module_spi_driver(mcp320x_driver);
--
2.34.1

2022-08-31 13:35:37

by Andy Shevchenko

Subject: Re: [PATCH v2 4/5] iio: adc: mcp320x: use device managed functions

On Wed, Aug 31, 2022 at 1:05 PM Vincent Whitchurch
<[email protected]> wrote:
>
> Use devm_* functions in probe to remove some code and to make it easier
> to add further calls to the probe function.

devm_regulator_get_enable() ?

--
With Best Regards,
Andy Shevchenko

2022-09-04 19:02:07

by Jonathan Cameron

Subject: Re: [PATCH v2 4/5] iio: adc: mcp320x: use device managed functions

On Wed, 31 Aug 2022 15:50:39 +0300
Andy Shevchenko <[email protected]> wrote:

> On Wed, Aug 31, 2022 at 1:05 PM Vincent Whitchurch
> <[email protected]> wrote:
> >
> > Use devm_* functions in probe to remove some code and to make it easier
> > to add further calls to the probe function.
>
> devm_regulator_get_enable() ?
>
Not yet generally available as I don't think there is a suitable immutable
branch.

So for material aimed at this cycle I'm fine with it not being used.

Jonathan