mfd: twl6030: Make twl6030_exit_irq() return void

This function returns 0 unconditionally, so there is no benefit in
returning a value at all and make the caller do error checking.

Also the caller (twl_remove()) cannot do anything sensible with an error
code. Passing it up the call stack isn't a good option because the i2c core
ignores error codes (apart from emitting an error message).

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Link: https://lore.kernel.org/r/20220113101430.12869-2-u.kleine-koenig@pengutronix.de

diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index 289b556dede28eb80d0cc27a300c5e87b8740953..d4194faf1cc3589c9f84fb4ee03fb4a5c4939702 100644 (file)
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -1036,12 +1036,12 @@ static void clocks_init(struct device *dev,
 static int twl_remove(struct i2c_client *client)
 {
        unsigned i, num_slaves;
-       int status;
+       int status = 0;
 
        if (twl_class_is_4030())
                status = twl4030_exit_irq();
        else
-               status = twl6030_exit_irq();
+               twl6030_exit_irq();
 
        if (status < 0)
                return status;

diff --git a/drivers/mfd/twl-core.h b/drivers/mfd/twl-core.h
index 6f96c2009a9f491f485e9752b647575bb9f42b37..1b916d2e87529f997364541161b01f1c6b338986 100644 (file)
--- a/drivers/mfd/twl-core.h
+++ b/drivers/mfd/twl-core.h
@@ -3,7 +3,7 @@
 #define __TWL_CORE_H__
 
 extern int twl6030_init_irq(struct device *dev, int irq_num);
-extern int twl6030_exit_irq(void);
+extern void twl6030_exit_irq(void);
 extern int twl4030_init_irq(struct device *dev, int irq_num);
 extern int twl4030_exit_irq(void);
 extern int twl4030_init_chip_irq(const char *chip);

diff --git a/drivers/mfd/twl6030-irq.c b/drivers/mfd/twl6030-irq.c
index 97af6c2a6007b70cb357ca7b043a7594ed1122b8..3c03681c124c044ae942aee5ccb223ce70ded8bc 100644 (file)
--- a/drivers/mfd/twl6030-irq.c
+++ b/drivers/mfd/twl6030-irq.c
@@ -438,7 +438,7 @@ fail_irq:
        return status;
 }
 
-int twl6030_exit_irq(void)
+void twl6030_exit_irq(void)
 {
        if (twl6030_irq && twl6030_irq->twl_irq) {
                unregister_pm_notifier(&twl6030_irq->pm_nb);
@@ -453,6 +453,5 @@ int twl6030_exit_irq(void)
                 * in this module.
                 */
        }
-       return 0;
 }