[10/15] iio: dac: ad5686: Make ad5686_remove() return void

Message ID	20211013203223.2694577-11-u.kleine-koenig@pengutronix.de
State	Not Applicable
Headers	show Return-Path: <linux-i2c-owner@vger.kernel.org> From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de> To: Jonathan Cameron <jic23@kernel.org>, Lars-Peter Clausen <lars@metafoo.de>, Michael Hennerich <Michael.Hennerich@analog.com> Cc: Mark Brown <broonie@kernel.org>, Wolfram Sang <wsa@kernel.org>, kernel@pengutronix.de, linux-i2c@vger.kernel.org, linux-iio@vger.kernel.org, linux-spi@vger.kernel.org Subject: [PATCH 10/15] iio: dac: ad5686: Make ad5686_remove() return void Date: Wed, 13 Oct 2021 22:32:18 +0200 Message-Id: <20211013203223.2694577-11-u.kleine-koenig@pengutronix.de> In-Reply-To: <20211013203223.2694577-1-u.kleine-koenig@pengutronix.de> References: <20211013203223.2694577-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	iio: let spi drivers return 0 in .remove() \| expand [00/15] iio: let spi drivers return 0 in .remove() [01/15] iio: accel: bma400: Make bma400_remove() return void [02/15] iio: accel: bmc150: Make bmc150_accel_core_remove() return void [04/15] iio: accel: kxsd9: Make kxsd9_common_remove() return void [05/15] iio: accel: mma7455: Make mma7455_core_remove() return void [06/15] iio: accel: ad5064: Make ad5064_core_remove() return void [07/15] iio: dac: ad5380: Make ad5380_remove() return void [08/15] iio: dac: ad5446: Make ad5446_remove() return void [09/15] iio: dac: ad5592r: Make ad5592r_remove() return void [10/15] iio: dac: ad5686: Make ad5686_remove() return void [12/15] iio: imu: st_lsm9ds0: Make st_lsm9ds0_remove() return void [13/15] iio: magn: hmc5843: Make hmc5843_common_remove() return void [15/15] iio: pressure: ms5611: Make ms5611_remove() return void

Message ID

20211013203223.2694577-11-u.kleine-koenig@pengutronix.de

State

Not Applicable

Headers

From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?=  <u.kleine-koenig@pengutronix.de>
To: Jonathan Cameron <jic23@kernel.org>,
        Lars-Peter Clausen <lars@metafoo.de>,
        Michael Hennerich <Michael.Hennerich@analog.com>
Cc: Mark Brown <broonie@kernel.org>, Wolfram Sang <wsa@kernel.org>,
        kernel@pengutronix.de, linux-i2c@vger.kernel.org,
        linux-iio@vger.kernel.org, linux-spi@vger.kernel.org
Subject: [PATCH 10/15] iio: dac: ad5686: Make ad5686_remove() return void
Date: Wed, 13 Oct 2021 22:32:18 +0200
Message-Id: <20211013203223.2694577-11-u.kleine-koenig@pengutronix.de>
In-Reply-To: <20211013203223.2694577-1-u.kleine-koenig@pengutronix.de>
References: <20211013203223.2694577-1-u.kleine-koenig@pengutronix.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

iio: let spi drivers return 0 in .remove() | expand

Commit Message

Uwe Kleine-König Oct. 13, 2021, 8:32 p.m. UTC

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>
---
 drivers/iio/dac/ad5686-spi.c | 4 +++-
 drivers/iio/dac/ad5686.c     | 4 +---
 drivers/iio/dac/ad5686.h     | 2 +-
 drivers/iio/dac/ad5696-i2c.c | 4 +++-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/drivers/iio/dac/ad5686-spi.c b/drivers/iio/dac/ad5686-spi.c
index 0188ded5137c..2628810fdbb1 100644
--- 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 fcb64f20ff64..8f001db775f4 100644
--- a/drivers/iio/dac/ad5686.c
+++ b/drivers/iio/dac/ad5686.c
@@ -538,7 +538,7 @@  int ad5686_probe(struct device *dev,
 }
 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 f89a6f92b427..cd5fff9e9d53 100644
--- 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 24a6a4a5a2e0..93f0e0e66c22 100644
--- 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[] = {