| Message ID | 20211012153945.2651412-12-u.kleine-koenig@pengutronix.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Make some spi device drivers return zero in .remove() | expand |
> -----Original Message----- > From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> > Sent: Dienstag, 12. Oktober 2021 17:40 > To: Arnd Bergmann <arnd@arndb.de>; Greg Kroah-Hartman > <gregkh@linuxfoundation.org>; Hennerich, Michael > <Michael.Hennerich@analog.com> > Cc: Mark Brown <broonie@kernel.org>; kernel@pengutronix.de; linux- > kernel@vger.kernel.org; linux-spi@vger.kernel.org > Subject: [PATCH v2 11/20] misc: ad525x_dpot: Make ad_dpot_remove() return > void > > Up to now ad_dpot_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> Acked-by: Michael Hennerich <michael.hennerich@analog.com> > --- > drivers/misc/ad525x_dpot-i2c.c | 3 ++- > drivers/misc/ad525x_dpot-spi.c | 3 ++- > drivers/misc/ad525x_dpot.c | 4 +--- > drivers/misc/ad525x_dpot.h | 2 +- > 4 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/misc/ad525x_dpot-i2c.c b/drivers/misc/ad525x_dpot-i2c.c > index bd869ec5edba..0ee0c6d808c3 100644 > --- a/drivers/misc/ad525x_dpot-i2c.c > +++ b/drivers/misc/ad525x_dpot-i2c.c > @@ -69,7 +69,8 @@ static int ad_dpot_i2c_probe(struct i2c_client *client, > > static int ad_dpot_i2c_remove(struct i2c_client *client) { > - return ad_dpot_remove(&client->dev); > + ad_dpot_remove(&client->dev); > + return 0; > } > > static const struct i2c_device_id ad_dpot_id[] = { diff --git > a/drivers/misc/ad525x_dpot-spi.c b/drivers/misc/ad525x_dpot-spi.c index > aea931dd272e..a9e75d80ad36 100644 > --- a/drivers/misc/ad525x_dpot-spi.c > +++ b/drivers/misc/ad525x_dpot-spi.c > @@ -92,7 +92,8 @@ static int ad_dpot_spi_probe(struct spi_device *spi) > > static int ad_dpot_spi_remove(struct spi_device *spi) { > - return ad_dpot_remove(&spi->dev); > + ad_dpot_remove(&spi->dev); > + return 0; > } > > static const struct spi_device_id ad_dpot_spi_id[] = { diff --git > a/drivers/misc/ad525x_dpot.c b/drivers/misc/ad525x_dpot.c index > 5d8f3f6a95f2..756ef6912b5a 100644 > --- a/drivers/misc/ad525x_dpot.c > +++ b/drivers/misc/ad525x_dpot.c > @@ -743,7 +743,7 @@ int ad_dpot_probe(struct device *dev, } > EXPORT_SYMBOL(ad_dpot_probe); > > -int ad_dpot_remove(struct device *dev) > +void ad_dpot_remove(struct device *dev) > { > struct dpot_data *data = dev_get_drvdata(dev); > int i; > @@ -753,8 +753,6 @@ int ad_dpot_remove(struct device *dev) > ad_dpot_remove_files(dev, data->feat, i); > > kfree(data); > - > - return 0; > } > EXPORT_SYMBOL(ad_dpot_remove); > > diff --git a/drivers/misc/ad525x_dpot.h b/drivers/misc/ad525x_dpot.h index > ee8dc9f5a45a..72a9d6801937 100644 > --- a/drivers/misc/ad525x_dpot.h > +++ b/drivers/misc/ad525x_dpot.h > @@ -209,6 +209,6 @@ struct ad_dpot_bus_data { > > int ad_dpot_probe(struct device *dev, struct ad_dpot_bus_data *bdata, > unsigned long devid, const char *name); -int > ad_dpot_remove(struct device *dev); > +void ad_dpot_remove(struct device *dev); > > #endif > -- > 2.30.2
diff --git a/drivers/misc/ad525x_dpot-i2c.c b/drivers/misc/ad525x_dpot-i2c.c index bd869ec5edba..0ee0c6d808c3 100644 --- a/drivers/misc/ad525x_dpot-i2c.c +++ b/drivers/misc/ad525x_dpot-i2c.c @@ -69,7 +69,8 @@ static int ad_dpot_i2c_probe(struct i2c_client *client, static int ad_dpot_i2c_remove(struct i2c_client *client) { - return ad_dpot_remove(&client->dev); + ad_dpot_remove(&client->dev); + return 0; } static const struct i2c_device_id ad_dpot_id[] = { diff --git a/drivers/misc/ad525x_dpot-spi.c b/drivers/misc/ad525x_dpot-spi.c index aea931dd272e..a9e75d80ad36 100644 --- a/drivers/misc/ad525x_dpot-spi.c +++ b/drivers/misc/ad525x_dpot-spi.c @@ -92,7 +92,8 @@ static int ad_dpot_spi_probe(struct spi_device *spi) static int ad_dpot_spi_remove(struct spi_device *spi) { - return ad_dpot_remove(&spi->dev); + ad_dpot_remove(&spi->dev); + return 0; } static const struct spi_device_id ad_dpot_spi_id[] = { diff --git a/drivers/misc/ad525x_dpot.c b/drivers/misc/ad525x_dpot.c index 5d8f3f6a95f2..756ef6912b5a 100644 --- a/drivers/misc/ad525x_dpot.c +++ b/drivers/misc/ad525x_dpot.c @@ -743,7 +743,7 @@ int ad_dpot_probe(struct device *dev, } EXPORT_SYMBOL(ad_dpot_probe); -int ad_dpot_remove(struct device *dev) +void ad_dpot_remove(struct device *dev) { struct dpot_data *data = dev_get_drvdata(dev); int i; @@ -753,8 +753,6 @@ int ad_dpot_remove(struct device *dev) ad_dpot_remove_files(dev, data->feat, i); kfree(data); - - return 0; } EXPORT_SYMBOL(ad_dpot_remove); diff --git a/drivers/misc/ad525x_dpot.h b/drivers/misc/ad525x_dpot.h index ee8dc9f5a45a..72a9d6801937 100644 --- a/drivers/misc/ad525x_dpot.h +++ b/drivers/misc/ad525x_dpot.h @@ -209,6 +209,6 @@ struct ad_dpot_bus_data { int ad_dpot_probe(struct device *dev, struct ad_dpot_bus_data *bdata, unsigned long devid, const char *name); -int ad_dpot_remove(struct device *dev); +void ad_dpot_remove(struct device *dev); #endif
Up to now ad_dpot_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/misc/ad525x_dpot-i2c.c | 3 ++- drivers/misc/ad525x_dpot-spi.c | 3 ++- drivers/misc/ad525x_dpot.c | 4 +--- drivers/misc/ad525x_dpot.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)