Commit 523742f2 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Jonathan Cameron
Browse files

iio: accel: mma7455: Make mma7455_core_remove() return void 



Up to now mma7455_core_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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: default avatarAlexandru Ardelean <ardeleanalex@gmail.com>
Link: https://lore.kernel.org/r/20211013203223.2694577-6-u.kleine-koenig@pengutronix.de


Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent df2171c6

drivers/iio/accel/mma7455.h

+1 −1
Original line number Diff line number Diff line
@@ -11,6 +11,6 @@ extern const struct regmap_config mma7455_core_regmap; 


int mma7455_core_probe(struct device *dev, struct regmap *regmap,

		       const char *name);

int mma7455_core_remove(struct device *dev);

void mma7455_core_remove(struct device *dev);



#endif

drivers/iio/accel/mma7455_core.c

+1 −3
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ int mma7455_core_probe(struct device *dev, struct regmap *regmap, 
}

EXPORT_SYMBOL_GPL(mma7455_core_probe);



int mma7455_core_remove(struct device *dev)

void mma7455_core_remove(struct device *dev)

{

	struct iio_dev *indio_dev = dev_get_drvdata(dev);

	struct mma7455_data *mma7455 = iio_priv(indio_dev);
@@ -304,8 +304,6 @@ int mma7455_core_remove(struct device *dev) 


	regmap_write(mma7455->regmap, MMA7455_REG_MCTL,

		     MMA7455_MCTL_MODE_STANDBY);



	return 0;

}

EXPORT_SYMBOL_GPL(mma7455_core_remove);

drivers/iio/accel/mma7455_i2c.c

+3 −1
Original line number Diff line number Diff line
@@ -28,7 +28,9 @@ static int mma7455_i2c_probe(struct i2c_client *i2c, 


static int mma7455_i2c_remove(struct i2c_client *i2c)

{

	return mma7455_core_remove(&i2c->dev);

	mma7455_core_remove(&i2c->dev);



	return 0;

}



static const struct i2c_device_id mma7455_i2c_ids[] = {

drivers/iio/accel/mma7455_spi.c

+3 −1
Original line number Diff line number Diff line
@@ -24,7 +24,9 @@ static int mma7455_spi_probe(struct spi_device *spi) 


static int mma7455_spi_remove(struct spi_device *spi)

{

	return mma7455_core_remove(&spi->dev);

	mma7455_core_remove(&spi->dev);



	return 0;

}



static const struct spi_device_id mma7455_spi_ids[] = {