leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mfd: twl6030: Make twl6030_exit_irq() return void

Browse Source 
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
This commit is contained in:
Uwe Kleine-König 2022-01-13 11:14:29 +01:00 committed by Lee Jones
parent 380422ad34
commit b6f2943182
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/mfd/twl-core.c
View File

@ -1036,12 +1036,12 @@ static void clocks_init(struct device *dev,
static int twl_remove(struct i2c_client *client) static int twl_remove(struct i2c_client *client)
{ {
unsigned i, num_slaves; unsigned i, num_slaves;
int status; int status = 0;
if (twl_class_is_4030()) if (twl_class_is_4030())
status = twl4030_exit_irq(); status = twl4030_exit_irq();
else else
status = twl6030_exit_irq(); twl6030_exit_irq();
if (status < 0) if (status < 0)
return status; return status;

2
drivers/mfd/twl-core.h
View File

@ -3,7 +3,7 @@
#define __TWL_CORE_H__ #define __TWL_CORE_H__
extern int twl6030_init_irq(struct device *dev, int irq_num); 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_init_irq(struct device *dev, int irq_num);
extern int twl4030_exit_irq(void); extern int twl4030_exit_irq(void);
extern int twl4030_init_chip_irq(const char *chip); extern int twl4030_init_chip_irq(const char *chip);

3
drivers/mfd/twl6030-irq.c
View File

@ -438,7 +438,7 @@ fail_irq:
return status; return status;
} }
int twl6030_exit_irq(void) void twl6030_exit_irq(void)
{ {
if (twl6030_irq && twl6030_irq->twl_irq) { if (twl6030_irq && twl6030_irq->twl_irq) {
unregister_pm_notifier(&twl6030_irq->pm_nb); unregister_pm_notifier(&twl6030_irq->pm_nb);
@ -453,6 +453,5 @@ int twl6030_exit_irq(void)
* in this module. * in this module.
*/ */
} }
return 0;
} }