evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mfd: Convert MAX8998 driver to irq_ API

Browse source 
The genirq core is being updated to pass struct irq_data to interrupt
operations, update the MAX8998 driver to the new API.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Mark Brown 2010-12-11 18:31:03 +00:00 • committed by Samuel Ortiz
parent 98d9bc13cd
commit 2898577e16
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
drivers/mfd/max8998-irq.c
View file

@ -102,16 +102,16 @@ irq_to_max8998_irq(struct max8998_dev *max8998, int irq)
return &max8998_irqs[irq - max8998->irq_base]; return &max8998_irqs[irq - max8998->irq_base];
} }
static void max8998_irq_lock(unsigned int irq) static void max8998_irq_lock(struct irq_data *data)
{ {
struct max8998_dev *max8998 = get_irq_chip_data(irq); struct max8998_dev *max8998 = irq_data_get_irq_chip_data(data);
mutex_lock(&max8998->irqlock); mutex_lock(&max8998->irqlock);
} }
static void max8998_irq_sync_unlock(unsigned int irq) static void max8998_irq_sync_unlock(struct irq_data *data)
{ {
struct max8998_dev *max8998 = get_irq_chip_data(irq); struct max8998_dev *max8998 = irq_data_get_irq_chip_data(data);
int i; int i;
for (i = 0; i < ARRAY_SIZE(max8998->irq_masks_cur); i++) { for (i = 0; i < ARRAY_SIZE(max8998->irq_masks_cur); i++) {
@ -129,28 +129,30 @@ static void max8998_irq_sync_unlock(unsigned int irq)
mutex_unlock(&max8998->irqlock); mutex_unlock(&max8998->irqlock);
} }
static void max8998_irq_unmask(unsigned int irq) static void max8998_irq_unmask(struct irq_data *data)
{ {
struct max8998_dev *max8998 = get_irq_chip_data(irq); struct max8998_dev *max8998 = irq_data_get_irq_chip_data(data);
struct max8998_irq_data *irq_data = irq_to_max8998_irq(max8998, irq); struct max8998_irq_data *irq_data = irq_to_max8998_irq(max8998,
data->irq);
max8998->irq_masks_cur[irq_data->reg - 1] &= ~irq_data->mask; max8998->irq_masks_cur[irq_data->reg - 1] &= ~irq_data->mask;
} }
static void max8998_irq_mask(unsigned int irq) static void max8998_irq_mask(struct irq_data *data)
{ {
struct max8998_dev *max8998 = get_irq_chip_data(irq); struct max8998_dev *max8998 = irq_data_get_irq_chip_data(data);
struct max8998_irq_data *irq_data = irq_to_max8998_irq(max8998, irq); struct max8998_irq_data *irq_data = irq_to_max8998_irq(max8998,
data->irq);
max8998->irq_masks_cur[irq_data->reg - 1] |= irq_data->mask; max8998->irq_masks_cur[irq_data->reg - 1] |= irq_data->mask;
} }
static struct irq_chip max8998_irq_chip = { static struct irq_chip max8998_irq_chip = {
.name = "max8998", .name = "max8998",
.bus_lock = max8998_irq_lock, .irq_bus_lock = max8998_irq_lock,
.bus_sync_unlock = max8998_irq_sync_unlock, .irq_bus_sync_unlock = max8998_irq_sync_unlock,
.mask = max8998_irq_mask, .irq_mask = max8998_irq_mask,
.unmask = max8998_irq_unmask, .irq_unmask = max8998_irq_unmask,
}; };
static irqreturn_t max8998_irq_thread(int irq, void *data) static irqreturn_t max8998_irq_thread(int irq, void *data)