hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

iio:magnetometer:mbc150: Make bmc150_magn_remove() return void 

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@pengutronix.de>
Link: https://lore.kernel.org/r/20220514133250.307955-1-u.kleine-koenig@pengutronix.de
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Uwe Kleine-König 2022-05-14 15:32:50 +02:00 committed by Jonathan Cameron
parent 70db0e93f7
commit d04d46dd82
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/iio/magnetometer/bmc150_magn.c
View File

@ -985,7 +985,7 @@ err_poweroff:
} }
EXPORT_SYMBOL_NS(bmc150_magn_probe, IIO_BMC150_MAGN); 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 iio_dev *indio_dev = dev_get_drvdata(dev);
struct bmc150_magn_data *data = iio_priv(indio_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); mutex_unlock(&data->mutex);
regulator_bulk_disable(ARRAY_SIZE(data->regulators), data->regulators); regulator_bulk_disable(ARRAY_SIZE(data->regulators), data->regulators);
return 0;
} }
EXPORT_SYMBOL_NS(bmc150_magn_remove, IIO_BMC150_MAGN); EXPORT_SYMBOL_NS(bmc150_magn_remove, IIO_BMC150_MAGN);

2
drivers/iio/magnetometer/bmc150_magn.h
View File

@ -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, int bmc150_magn_probe(struct device *dev, struct regmap *regmap, int irq,
const char *name); const char *name);
int bmc150_magn_remove(struct device *dev); void bmc150_magn_remove(struct device *dev);
#endif /* _BMC150_MAGN_H_ */ #endif /* _BMC150_MAGN_H_ */

4
drivers/iio/magnetometer/bmc150_magn_i2c.c
View File

@ -36,7 +36,9 @@ static int bmc150_magn_i2c_probe(struct i2c_client *client,
static int bmc150_magn_i2c_remove(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[] = { static const struct acpi_device_id bmc150_magn_acpi_match[] = {