Commit d115e88c authored by Paul Cercueil's avatar Paul Cercueil Committed by Lee Jones
Browse files

mfd: tps6586x: Remove #ifdef guards for PM related functions 



Use the new pm_sleep_ptr() macro to handle the .irq_set_wake() callback.

This macro allows the mt6397_irq_set_wake() function to be automatically
dropped by the compiler when CONFIG_SUSPEND is disabled, without having
to use #ifdef guards.

This has the advantage of always compiling these functions in,
independently of any Kconfig option. Thanks to that, bugs and other
regressions are subsequently easier to catch.

Signed-off-by: default avatarPaul Cercueil <paul@crapouillou.net>
Signed-off-by: default avatarLee Jones <lee@kernel.org>
parent 2d81212c

drivers/mfd/tps6586x.c

+1 −5
Original line number Diff line number Diff line
@@ -269,15 +269,11 @@ static void tps6586x_irq_sync_unlock(struct irq_data *data) 
	mutex_unlock(&tps6586x->irq_lock);

}



#ifdef CONFIG_PM_SLEEP

static int tps6586x_irq_set_wake(struct irq_data *irq_data, unsigned int on)

{

	struct tps6586x *tps6586x = irq_data_get_irq_chip_data(irq_data);

	return irq_set_irq_wake(tps6586x->irq, on);

}

#else

#define tps6586x_irq_set_wake NULL

#endif



static struct irq_chip tps6586x_irq_chip = {

	.name = "tps6586x",
@@ -285,7 +281,7 @@ static struct irq_chip tps6586x_irq_chip = { 
	.irq_bus_sync_unlock = tps6586x_irq_sync_unlock,

	.irq_disable = tps6586x_irq_disable,

	.irq_enable = tps6586x_irq_enable,

	.irq_set_wake = tps6586x_irq_set_wake,

	.irq_set_wake = pm_sleep_ptr(tps6586x_irq_set_wake),

};



static int tps6586x_irq_map(struct irq_domain *h, unsigned int virq,