iio: dac: ad5380: drop driver remove callbacks

Drop use of the driver remove callbacks in the ad5380 driver.

By making use of a few more devm_ helpers, we can avoid the need for
remove callbacks entirely.

Also make use of dev_err_probe() while at it.

Signed-off-by: David Lechner <dlechner@baylibre.com>
Link: https://patch.msgid.link/20241023-iio-regulator-refactor-round-5-v1-2-d0bd396b3f50@baylibre.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/dac/ad5380.c b/drivers/iio/dac/ad5380.c
index 7d1d705..392a1c7 100644 (file)
--- a/drivers/iio/dac/ad5380.c
+++ b/drivers/iio/dac/ad5380.c
@@ -339,14 +339,14 @@ static const struct ad5380_chip_info ad5380_chip_info_tbl[] = {
        },
 };
 
-static int ad5380_alloc_channels(struct iio_dev *indio_dev)
+static int ad5380_alloc_channels(struct device *dev, struct iio_dev *indio_dev)
 {
        struct ad5380_state *st = iio_priv(indio_dev);
        struct iio_chan_spec *channels;
        unsigned int i;
 
-       channels = kcalloc(st->chip_info->num_channels,
-                          sizeof(struct iio_chan_spec), GFP_KERNEL);
+       channels = devm_kcalloc(dev, st->chip_info->num_channels,
+                               sizeof(struct iio_chan_spec), GFP_KERNEL);
 
        if (!channels)
                return -ENOMEM;
@@ -377,7 +377,6 @@ static int ad5380_probe(struct device *dev, struct regmap *regmap,
        }
 
        st = iio_priv(indio_dev);
-       dev_set_drvdata(dev, indio_dev);
 
        st->chip_info = &ad5380_chip_info_tbl[type];
        st->regmap = regmap;
@@ -389,20 +388,16 @@ static int ad5380_probe(struct device *dev, struct regmap *regmap,
 
        mutex_init(&st->lock);
 
-       ret = ad5380_alloc_channels(indio_dev);
-       if (ret) {
-               dev_err(dev, "Failed to allocate channel spec: %d\n", ret);
-               return ret;
-       }
+       ret = ad5380_alloc_channels(dev, indio_dev);
+       if (ret)
+               return dev_err_probe(dev, ret, "Failed to allocate channel spec\n");
 
        if (st->chip_info->int_vref == 2500)
                ctrl |= AD5380_CTRL_INT_VREF_2V5;
 
        ret = devm_regulator_get_enable_read_voltage(dev, "vref");
-       if (ret < 0 && ret != -ENODEV) {
-               dev_err(dev, "Failed to get vref voltage: %d\n", ret);
-               goto error_free_reg;
-       }
+       if (ret < 0 && ret != -ENODEV)
+               return dev_err_probe(dev, ret, "Failed to get vref voltage\n");
        if (ret == -ENODEV) {
                st->vref = st->chip_info->int_vref;
                ctrl |= AD5380_CTRL_INT_VREF_EN;
@@ -411,32 +406,14 @@ static int ad5380_probe(struct device *dev, struct regmap *regmap,
        }
 
        ret = regmap_write(st->regmap, AD5380_REG_SF_CTRL, ctrl);
-       if (ret) {
-               dev_err(dev, "Failed to write to device: %d\n", ret);
-               goto error_free_reg;
-       }
+       if (ret)
+               return dev_err_probe(dev, ret, "Failed to write to device\n");
 
-       ret = iio_device_register(indio_dev);
-       if (ret) {
-               dev_err(dev, "Failed to register iio device: %d\n", ret);
-               goto error_free_reg;
-       }
+       ret = devm_iio_device_register(dev, indio_dev);
+       if (ret)
+               return dev_err_probe(dev, ret, "Failed to register iio device\n");
 
        return 0;
-
-error_free_reg:
-       kfree(indio_dev->channels);
-
-       return ret;
-}
-
-static void ad5380_remove(struct device *dev)
-{
-       struct iio_dev *indio_dev = dev_get_drvdata(dev);
-
-       iio_device_unregister(indio_dev);
-
-       kfree(indio_dev->channels);
 }
 
 static bool ad5380_reg_false(struct device *dev, unsigned int reg)
@@ -470,11 +447,6 @@ static int ad5380_spi_probe(struct spi_device *spi)
        return ad5380_probe(&spi->dev, regmap, id->driver_data, id->name);
 }
 
-static void ad5380_spi_remove(struct spi_device *spi)
-{
-       ad5380_remove(&spi->dev);
-}
-
 static const struct spi_device_id ad5380_spi_ids[] = {
        { "ad5380-3", ID_AD5380_3 },
        { "ad5380-5", ID_AD5380_5 },
@@ -501,7 +473,6 @@ static struct spi_driver ad5380_spi_driver = {
                   .name = "ad5380",
        },
        .probe = ad5380_spi_probe,
-       .remove = ad5380_spi_remove,
        .id_table = ad5380_spi_ids,
 };
 
@@ -543,11 +514,6 @@ static int ad5380_i2c_probe(struct i2c_client *i2c)
        return ad5380_probe(&i2c->dev, regmap, id->driver_data, id->name);
 }
 
-static void ad5380_i2c_remove(struct i2c_client *i2c)
-{
-       ad5380_remove(&i2c->dev);
-}
-
 static const struct i2c_device_id ad5380_i2c_ids[] = {
        { "ad5380-3", ID_AD5380_3 },
        { "ad5380-5", ID_AD5380_5 },
@@ -574,7 +540,6 @@ static struct i2c_driver ad5380_i2c_driver = {
                   .name = "ad5380",
        },
        .probe = ad5380_i2c_probe,
-       .remove = ad5380_i2c_remove,
        .id_table = ad5380_i2c_ids,
 };