OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mfd: Convert HTC EGPIO driver to irq_ API 

The genirq core is being converted to pass a struct irq_data to interrupt
operations rather than an IRQ number.

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 16:43:59 +00:00 committed by Samuel Ortiz
parent c232f22fc6
commit 949b9decae
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/mfd/htc-egpio.c
View File

@ -70,31 +70,32 @@ static inline void ack_irqs(struct egpio_info *ei)
ei->ack_write, ei->ack_register << ei->bus_shift); ei->ack_write, ei->ack_register << ei->bus_shift);
} }
static void egpio_ack(unsigned int irq) static void egpio_ack(struct irq_data *data)
{ {
} }
/* There does not appear to be a way to proactively mask interrupts /* There does not appear to be a way to proactively mask interrupts
* on the egpio chip itself. So, we simply ignore interrupts that * on the egpio chip itself. So, we simply ignore interrupts that
* aren't desired. */ * aren't desired. */
static void egpio_mask(unsigned int irq) static void egpio_mask(struct irq_data *data)
{ {
struct egpio_info *ei = get_irq_chip_data(irq); struct egpio_info *ei = irq_data_get_irq_chip_data(data);
ei->irqs_enabled &= ~(1 << (irq - ei->irq_start)); ei->irqs_enabled &= ~(1 << (data->irq - ei->irq_start));
pr_debug("EGPIO mask %d %04x\n", irq, ei->irqs_enabled); pr_debug("EGPIO mask %d %04x\n", data->irq, ei->irqs_enabled);
} }
static void egpio_unmask(unsigned int irq)
static void egpio_unmask(struct irq_data *data)
{ {
struct egpio_info *ei = get_irq_chip_data(irq); struct egpio_info *ei = irq_data_get_irq_chip_data(data);
ei->irqs_enabled |= 1 << (irq - ei->irq_start); ei->irqs_enabled |= 1 << (data->irq - ei->irq_start);
pr_debug("EGPIO unmask %d %04x\n", irq, ei->irqs_enabled); pr_debug("EGPIO unmask %d %04x\n", data->irq, ei->irqs_enabled);
} }
static struct irq_chip egpio_muxed_chip = { static struct irq_chip egpio_muxed_chip = {
.name = "htc-egpio", .name = "htc-egpio",
.ack = egpio_ack, .irq_ack = egpio_ack,
.mask = egpio_mask, .irq_mask = egpio_mask,
.unmask = egpio_unmask, .irq_unmask = egpio_unmask,
}; };
static void egpio_handler(unsigned int irq, struct irq_desc *desc) static void egpio_handler(unsigned int irq, struct irq_desc *desc)