tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
authored by
Mark Brown
and committed by
Samuel Ortiz
949b9dec
c232f22f
+14
-13
+14
-13
drivers/mfd/htc-egpio.c
+14
-13
drivers/mfd/htc-egpio.c
···
70
70
ei->ack_write, ei->ack_register << ei->bus_shift);
71
71
}
72
72
73
-
static void egpio_ack(unsigned int irq)
73
+
static void egpio_ack(struct irq_data *data)
74
74
{
75
75
}
76
76
77
77
/* There does not appear to be a way to proactively mask interrupts
78
78
* on the egpio chip itself. So, we simply ignore interrupts that
79
79
* aren't desired. */
80
-
static void egpio_mask(unsigned int irq)
80
+
static void egpio_mask(struct irq_data *data)
81
81
{
82
-
struct egpio_info *ei = get_irq_chip_data(irq);
83
-
ei->irqs_enabled &= ~(1 << (irq - ei->irq_start));
84
-
pr_debug("EGPIO mask %d %04x\n", irq, ei->irqs_enabled);
82
+
struct egpio_info *ei = irq_data_get_irq_chip_data(data);
83
+
ei->irqs_enabled &= ~(1 << (data->irq - ei->irq_start));
84
+
pr_debug("EGPIO mask %d %04x\n", data->irq, ei->irqs_enabled);
85
85
}
86
-
static void egpio_unmask(unsigned int irq)
86
+
87
+
static void egpio_unmask(struct irq_data *data)
87
88
{
88
-
struct egpio_info *ei = get_irq_chip_data(irq);
89
-
ei->irqs_enabled |= 1 << (irq - ei->irq_start);
90
-
pr_debug("EGPIO unmask %d %04x\n", irq, ei->irqs_enabled);
89
+
struct egpio_info *ei = irq_data_get_irq_chip_data(data);
90
+
ei->irqs_enabled |= 1 << (data->irq - ei->irq_start);
91
+
pr_debug("EGPIO unmask %d %04x\n", data->irq, ei->irqs_enabled);
91
92
}
92
93
93
94
static struct irq_chip egpio_muxed_chip = {
94
-
.name = "htc-egpio",
95
-
.ack = egpio_ack,
96
-
.mask = egpio_mask,
97
-
.unmask = egpio_unmask,
95
+
.name = "htc-egpio",
96
+
.irq_ack = egpio_ack,
97
+
.irq_mask = egpio_mask,
98
+
.irq_unmask = egpio_unmask,
98
99
};
99
100
100
101
static void egpio_handler(unsigned int irq, struct irq_desc *desc)