aboutsummaryrefslogtreecommitdiff
path: root/drivers/mfd/twl4030-irq.c
diff options
context:
space:
mode:
authorGravatar Uwe Kleine-König <u.kleine-koenig@pengutronix.de> 2022-01-13 11:14:30 +0100
committerGravatar Lee Jones <lee.jones@linaro.org> 2022-04-28 17:24:40 +0100
commit724c3be3db3413b930320cb716214e37cf0a40e2 (patch)
tree9ae1bf98eff7eae25c7143ec4f465a771d197ce1 /drivers/mfd/twl4030-irq.c
parentmfd: twl6030: Make twl6030_exit_irq() return void (diff)
downloadlinux-724c3be3db3413b930320cb716214e37cf0a40e2.tar.gz
linux-724c3be3db3413b930320cb716214e37cf0a40e2.tar.bz2
linux-724c3be3db3413b930320cb716214e37cf0a40e2.zip
mfd: twl4030: Make twl4030_exit_irq() return void
If twl4030_exit_irq() returns an error, the effect is that the caller (twl_remove()) forwards the error to the i2c core without unregistering its dummy slave devices. This only makes the i2c core emit another error message and then it still removes the device. In this situation it doesn't make sense to abort the remove cleanup and not unregister the slave devices. So do that. Then return value is actually unused and twl4030_exit_irq() can better be changed to return no value at all. 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-3-u.kleine-koenig@pengutronix.de
Diffstat (limited to 'drivers/mfd/twl4030-irq.c')
-rw-r--r--drivers/mfd/twl4030-irq.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
index ab417438d1fa..4f576f0160a9 100644
--- a/drivers/mfd/twl4030-irq.c
+++ b/drivers/mfd/twl4030-irq.c
@@ -753,14 +753,11 @@ fail:
return status;
}
-int twl4030_exit_irq(void)
+void twl4030_exit_irq(void)
{
/* FIXME undo twl_init_irq() */
- if (twl4030_irq_base) {
+ if (twl4030_irq_base)
pr_err("twl4030: can't yet clean up IRQs?\n");
- return -ENOSYS;
- }
- return 0;
}
int twl4030_init_chip_irq(const char *chip)