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

iio: pressure: ms5611: Make ms5611_remove() return void 



Up to now ms5611_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-16-u.kleine-koenig@pengutronix.de


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

drivers/iio/pressure/ms5611.h

+1 −1
Original line number Diff line number Diff line
@@ -61,6 +61,6 @@ struct ms5611_state { 


int ms5611_probe(struct iio_dev *indio_dev, struct device *dev,

		 const char *name, int type);

int ms5611_remove(struct iio_dev *indio_dev);

void ms5611_remove(struct iio_dev *indio_dev);



#endif /* _MS5611_H */

drivers/iio/pressure/ms5611_core.c

+1 −3
Original line number Diff line number Diff line
@@ -474,13 +474,11 @@ int ms5611_probe(struct iio_dev *indio_dev, struct device *dev, 
}

EXPORT_SYMBOL(ms5611_probe);



int ms5611_remove(struct iio_dev *indio_dev)

void ms5611_remove(struct iio_dev *indio_dev)

{

	iio_device_unregister(indio_dev);

	iio_triggered_buffer_cleanup(indio_dev);

	ms5611_fini(indio_dev);



	return 0;

}

EXPORT_SYMBOL(ms5611_remove);

drivers/iio/pressure/ms5611_i2c.c

+3 −1
Original line number Diff line number Diff line
@@ -110,7 +110,9 @@ static int ms5611_i2c_probe(struct i2c_client *client, 


static int ms5611_i2c_remove(struct i2c_client *client)

{

	return ms5611_remove(i2c_get_clientdata(client));

	ms5611_remove(i2c_get_clientdata(client));



	return 0;

}



static const struct of_device_id ms5611_i2c_matches[] = {

drivers/iio/pressure/ms5611_spi.c

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


static int ms5611_spi_remove(struct spi_device *spi)

{

	return ms5611_remove(spi_get_drvdata(spi));

	ms5611_remove(spi_get_drvdata(spi));



	return 0;

}



static const struct of_device_id ms5611_spi_matches[] = {