Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d664f200 authored by Mark Brown's avatar Mark Brown Committed by Samuel Ortiz
Browse files

mfd: Convert WM8994/58 interrupt masking to enable/disable operations 



The WM8994/58 interrupt masking support is a much better match for the genirq
enable and disable operations than for the mask and unmask operations. The
latter are intended to used during interrupt handling for temporary changes
which isn't really practical on a slow bus. Convert the operations over to
match this.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent f624effb

drivers/mfd/wm8994-irq.c

+4 −4
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ static void wm8994_irq_sync_unlock(struct irq_data *data) 
	mutex_unlock(&wm8994->irq_lock);

}



static void wm8994_irq_unmask(struct irq_data *data)

static void wm8994_irq_enable(struct irq_data *data)

{

	struct wm8994 *wm8994 = irq_data_get_irq_chip_data(data);

	struct wm8994_irq_data *irq_data = irq_to_wm8994_irq(wm8994,
@@ -191,7 +191,7 @@ static void wm8994_irq_unmask(struct irq_data *data) 
	wm8994->irq_masks_cur[irq_data->reg - 1] &= ~irq_data->mask;

}



static void wm8994_irq_mask(struct irq_data *data)

static void wm8994_irq_disable(struct irq_data *data)

{

	struct wm8994 *wm8994 = irq_data_get_irq_chip_data(data);

	struct wm8994_irq_data *irq_data = irq_to_wm8994_irq(wm8994,
@@ -204,8 +204,8 @@ static struct irq_chip wm8994_irq_chip = { 
	.name			= "wm8994",

	.irq_bus_lock		= wm8994_irq_lock,

	.irq_bus_sync_unlock	= wm8994_irq_sync_unlock,

	.irq_mask		= wm8994_irq_mask,

	.irq_unmask		= wm8994_irq_unmask,

	.irq_disable		= wm8994_irq_disable,

	.irq_enable		= wm8994_irq_enable,

};



/* The processing of the primary interrupt occurs in a thread so that