hwmon: (adt7x10) Make adt7x10_remove() return void

Up to now adt7x10_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>
Link: https://lore.kernel.org/r/20211011132754.2479853-3-u.kleine-koenig@pengutronix.de
Signed-off-by: Guenter Roeck <linux@roeck-us.net>

diff --git a/drivers/hwmon/adt7310.c b/drivers/hwmon/adt7310.c
index 9fad01191620c5a84ef4d47e0460b85450d18509..c40cac16af68385b81eabbba22d0453991afbea7 100644 (file)
--- a/drivers/hwmon/adt7310.c
+++ b/drivers/hwmon/adt7310.c
@@ -90,7 +90,8 @@ static int adt7310_spi_probe(struct spi_device *spi)
 
 static int adt7310_spi_remove(struct spi_device *spi)
 {
-       return adt7x10_remove(&spi->dev, spi->irq);
+       adt7x10_remove(&spi->dev, spi->irq);
+       return 0;
 }
 
 static const struct spi_device_id adt7310_id[] = {

diff --git a/drivers/hwmon/adt7410.c b/drivers/hwmon/adt7410.c
index 9d80895d0266e808bfe262285a8393af978bdfec..973db057427be6aa17dced837a72f002fbf200c5 100644 (file)
--- a/drivers/hwmon/adt7410.c
+++ b/drivers/hwmon/adt7410.c
@@ -50,7 +50,8 @@ static int adt7410_i2c_probe(struct i2c_client *client)
 
 static int adt7410_i2c_remove(struct i2c_client *client)
 {
-       return adt7x10_remove(&client->dev, client->irq);
+       adt7x10_remove(&client->dev, client->irq);
+       return 0;
 }
 
 static const struct i2c_device_id adt7410_ids[] = {

diff --git a/drivers/hwmon/adt7x10.c b/drivers/hwmon/adt7x10.c
index 3f03b4cf58585806f46ea764ee73cbfd375d5786..e9d33aa78a19377ddd4a333c2dfe67b61373caef 100644 (file)
--- a/drivers/hwmon/adt7x10.c
+++ b/drivers/hwmon/adt7x10.c
@@ -444,7 +444,7 @@ exit_restore:
 }
 EXPORT_SYMBOL_GPL(adt7x10_probe);
 
-int adt7x10_remove(struct device *dev, int irq)
+void adt7x10_remove(struct device *dev, int irq)
 {
        struct adt7x10_data *data = dev_get_drvdata(dev);
 
@@ -457,7 +457,6 @@ int adt7x10_remove(struct device *dev, int irq)
        sysfs_remove_group(&dev->kobj, &adt7x10_group);
        if (data->oldconfig != data->config)
                adt7x10_write_byte(dev, ADT7X10_CONFIG, data->oldconfig);
-       return 0;
 }
 EXPORT_SYMBOL_GPL(adt7x10_remove);
 

diff --git a/drivers/hwmon/adt7x10.h b/drivers/hwmon/adt7x10.h
index 21ad15ce316370e5fbb21f6b6154e73c602735f7..a1ae682eb32e6b2ff9d3c45c0c440d281e38433e 100644 (file)
--- a/drivers/hwmon/adt7x10.h
+++ b/drivers/hwmon/adt7x10.h
@@ -26,7 +26,7 @@ struct adt7x10_ops {
 
 int adt7x10_probe(struct device *dev, const char *name, int irq,
        const struct adt7x10_ops *ops);
-int adt7x10_remove(struct device *dev, int irq);
+void adt7x10_remove(struct device *dev, int irq);
 
 #ifdef CONFIG_PM_SLEEP
 extern const struct dev_pm_ops adt7x10_dev_pm_ops;