Commit b6f29431 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Lee Jones
Browse files

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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Link: https://lore.kernel.org/r/20220113101430.12869-2-u.kleine-koenig@pengutronix.de
parent 380422ad

drivers/mfd/twl-core.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/mfd/twl-core.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/mfd/twl6030-irq.c

+1 −2
Original line number Diff line number Diff line
@@ -438,7 +438,7 @@ int twl6030_init_irq(struct device *dev, int irq_num) 
	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;

}