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

mfd: mt6397-irq: 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 52c9d719

drivers/mfd/mt6397-irq.c

+1 −5
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ static void mt6397_irq_enable(struct irq_data *data) 
	mt6397->irq_masks_cur[reg] |= BIT(shift);

}



#ifdef CONFIG_PM_SLEEP

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

{

	struct mt6397_chip *mt6397 = irq_data_get_irq_chip_data(irq_data);
@@ -68,9 +67,6 @@ static int mt6397_irq_set_wake(struct irq_data *irq_data, unsigned int on) 


	return 0;

}

#else

#define mt6397_irq_set_wake NULL

#endif



static struct irq_chip mt6397_irq_chip = {

	.name = "mt6397-irq",
@@ -78,7 +74,7 @@ static struct irq_chip mt6397_irq_chip = { 
	.irq_bus_sync_unlock = mt6397_irq_sync_unlock,

	.irq_enable = mt6397_irq_enable,

	.irq_disable = mt6397_irq_disable,

	.irq_set_wake = mt6397_irq_set_wake,

	.irq_set_wake = pm_sleep_ptr(mt6397_irq_set_wake),

};



static void mt6397_irq_handle_reg(struct mt6397_chip *mt6397, int reg,