On Sat, 14 May 2022 15:32:50 +0200
Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx> wrote:
> bmc150_magn_remove() always returns zero. Make it return no value which
> makes it easier to see in the callers that there is no error to handle.
>
> Also the return value of i2c driver remove callbacks is ignored anyway.
> This prepares making i2c remove callbacks return void, too.
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx>
Applied.
Thanks,
Jonathan
> ---
> drivers/iio/magnetometer/bmc150_magn.c | 3 +--
> drivers/iio/magnetometer/bmc150_magn.h | 2 +-
> drivers/iio/magnetometer/bmc150_magn_i2c.c | 4 +++-
> 3 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/iio/magnetometer/bmc150_magn.c b/drivers/iio/magnetometer/bmc150_magn.c
> index 64e8b04e654b..06d5a1ef1fbd 100644
> --- a/drivers/iio/magnetometer/bmc150_magn.c
> +++ b/drivers/iio/magnetometer/bmc150_magn.c
> @@ -985,7 +985,7 @@ int bmc150_magn_probe(struct device *dev, struct regmap *regmap,
> }
> EXPORT_SYMBOL_NS(bmc150_magn_probe, IIO_BMC150_MAGN);
>
> -int bmc150_magn_remove(struct device *dev)
> +void bmc150_magn_remove(struct device *dev)
> {
> struct iio_dev *indio_dev = dev_get_drvdata(dev);
> struct bmc150_magn_data *data = iio_priv(indio_dev);
> @@ -1008,7 +1008,6 @@ int bmc150_magn_remove(struct device *dev)
> mutex_unlock(&data->mutex);
>
> regulator_bulk_disable(ARRAY_SIZE(data->regulators), data->regulators);
> - return 0;
> }
> EXPORT_SYMBOL_NS(bmc150_magn_remove, IIO_BMC150_MAGN);
>
> diff --git a/drivers/iio/magnetometer/bmc150_magn.h b/drivers/iio/magnetometer/bmc150_magn.h
> index 3b69232afd2c..98c086d10c13 100644
> --- a/drivers/iio/magnetometer/bmc150_magn.h
> +++ b/drivers/iio/magnetometer/bmc150_magn.h
> @@ -7,6 +7,6 @@ extern const struct dev_pm_ops bmc150_magn_pm_ops;
>
> int bmc150_magn_probe(struct device *dev, struct regmap *regmap, int irq,
> const char *name);
> -int bmc150_magn_remove(struct device *dev);
> +void bmc150_magn_remove(struct device *dev);
>
> #endif /* _BMC150_MAGN_H_ */
> diff --git a/drivers/iio/magnetometer/bmc150_magn_i2c.c b/drivers/iio/magnetometer/bmc150_magn_i2c.c
> index e39b89661ad1..65c004411d0f 100644
> --- a/drivers/iio/magnetometer/bmc150_magn_i2c.c
> +++ b/drivers/iio/magnetometer/bmc150_magn_i2c.c
> @@ -36,7 +36,9 @@ static int bmc150_magn_i2c_probe(struct i2c_client *client,
>
> static int bmc150_magn_i2c_remove(struct i2c_client *client)
> {
> - return bmc150_magn_remove(&client->dev);
> + bmc150_magn_remove(&client->dev);
> +
> + return 0;
> }
>
> static const struct acpi_device_id bmc150_magn_acpi_match[] = {
>
> base-commit: 3123109284176b1532874591f7c81f3837bbdc17
