iio: dac: ad5686: Make ad5686_remove() return void

Up to now ad5686_remove() returns zero unconditionally. Make it return
void instead which makes it easier to see in the callers that there is
no error to handle.

Also the return value of i2c and spi remove callbacks is ignored anyway.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: Alexandru Ardelean <ardeleanalex@gmail.com>
Link: https://lore.kernel.org/r/20211013203223.2694577-11-u.kleine-koenig@pengutronix.de
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/dac/ad5686-spi.c b/drivers/iio/dac/ad5686-spi.c
index 0188ded5137c87807d6ae694c9d0eacad13fab16..2628810fdbb1ffc9f8ff7e825b0a51d8b4da87b3 100644 (file)
--- a/drivers/iio/dac/ad5686-spi.c
+++ b/drivers/iio/dac/ad5686-spi.c
@@ -97,7 +97,9 @@ static int ad5686_spi_probe(struct spi_device *spi)
 
 static int ad5686_spi_remove(struct spi_device *spi)
 {
-       return ad5686_remove(&spi->dev);
+       ad5686_remove(&spi->dev);
+
+       return 0;
 }
 
 static const struct spi_device_id ad5686_spi_id[] = {

diff --git a/drivers/iio/dac/ad5686.c b/drivers/iio/dac/ad5686.c
index fcb64f20ff64d182af02afd97f4e32f0589c253c..8f001db775f481a46ce4fc47d732219cdabb6e5c 100644 (file)
--- a/drivers/iio/dac/ad5686.c
+++ b/drivers/iio/dac/ad5686.c
@@ -538,7 +538,7 @@ error_disable_reg:
 }
 EXPORT_SYMBOL_GPL(ad5686_probe);
 
-int ad5686_remove(struct device *dev)
+void ad5686_remove(struct device *dev)
 {
        struct iio_dev *indio_dev = dev_get_drvdata(dev);
        struct ad5686_state *st = iio_priv(indio_dev);
@@ -546,8 +546,6 @@ int ad5686_remove(struct device *dev)
        iio_device_unregister(indio_dev);
        if (!IS_ERR(st->reg))
                regulator_disable(st->reg);
-
-       return 0;
 }
 EXPORT_SYMBOL_GPL(ad5686_remove);
 

diff --git a/drivers/iio/dac/ad5686.h b/drivers/iio/dac/ad5686.h
index f89a6f92b4270673085f0a02480ecd8d2eda2e83..cd5fff9e9d53714969d10a8eac2db1e638451e55 100644 (file)
--- a/drivers/iio/dac/ad5686.h
+++ b/drivers/iio/dac/ad5686.h
@@ -154,7 +154,7 @@ int ad5686_probe(struct device *dev,
                 const char *name, ad5686_write_func write,
                 ad5686_read_func read);
 
-int ad5686_remove(struct device *dev);
+void ad5686_remove(struct device *dev);
 
 
 #endif /* __DRIVERS_IIO_DAC_AD5686_H__ */

diff --git a/drivers/iio/dac/ad5696-i2c.c b/drivers/iio/dac/ad5696-i2c.c
index 24a6a4a5a2e077c6ba6daaab4e67d2b8a17f1d3a..93f0e0e66c22794fee790c1f1205591cef39b608 100644 (file)
--- a/drivers/iio/dac/ad5696-i2c.c
+++ b/drivers/iio/dac/ad5696-i2c.c
@@ -67,7 +67,9 @@ static int ad5686_i2c_probe(struct i2c_client *i2c,
 
 static int ad5686_i2c_remove(struct i2c_client *i2c)
 {
-       return ad5686_remove(&i2c->dev);
+       ad5686_remove(&i2c->dev);
+
+       return 0;
 }
 
 static const struct i2c_device_id ad5686_i2c_id[] = {