aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/parisc/eisa.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-02-06 15:45:52 -0500
committerJames Bottomley <James.Bottomley@suse.de>2011-02-10 11:22:14 -0500
commit4c4231ea2f794d73bbb50b8d84e00c66a012a607 (patch)
tree4c2470ea880a75c22f275402fe5a186902edd6d5 /drivers/parisc/eisa.c
parent9804c9eaeacfe78651052c5ddff31099f60ef78c (diff)
[PARISC] Convert to new irq_chip functions
Convert all the parisc driver interrupt handlers (dino, eisa, gsc, iosapic and superio) as well as the cpu interrupts. Prepare show_interrupts for GENERIC_HARDIRQS_NO_DEPRECATED and finally selects that Kconfig option [jejb: compile and testing fixes] Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/parisc/eisa.c')
-rw-r--r--drivers/parisc/eisa.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/parisc/eisa.c b/drivers/parisc/eisa.c
index e860038b0b84..deeec32a5803 100644
--- a/drivers/parisc/eisa.c
+++ b/drivers/parisc/eisa.c
@@ -144,8 +144,9 @@ static unsigned int eisa_irq_level __read_mostly; /* default to edge triggered *
144 144
145 145
146/* called by free irq */ 146/* called by free irq */
147static void eisa_mask_irq(unsigned int irq) 147static void eisa_mask_irq(struct irq_data *d)
148{ 148{
149 unsigned int irq = d->irq;
149 unsigned long flags; 150 unsigned long flags;
150 151
151 EISA_DBG("disable irq %d\n", irq); 152 EISA_DBG("disable irq %d\n", irq);
@@ -164,8 +165,9 @@ static void eisa_mask_irq(unsigned int irq)
164} 165}
165 166
166/* called by request irq */ 167/* called by request irq */
167static void eisa_unmask_irq(unsigned int irq) 168static void eisa_unmask_irq(struct irq_data *d)
168{ 169{
170 unsigned int irq = d->irq;
169 unsigned long flags; 171 unsigned long flags;
170 EISA_DBG("enable irq %d\n", irq); 172 EISA_DBG("enable irq %d\n", irq);
171 173
@@ -183,9 +185,9 @@ static void eisa_unmask_irq(unsigned int irq)
183} 185}
184 186
185static struct irq_chip eisa_interrupt_type = { 187static struct irq_chip eisa_interrupt_type = {
186 .name = "EISA", 188 .name = "EISA",
187 .unmask = eisa_unmask_irq, 189 .irq_unmask = eisa_unmask_irq,
188 .mask = eisa_mask_irq, 190 .irq_mask = eisa_mask_irq,
189}; 191};
190 192
191static irqreturn_t eisa_irq(int wax_irq, void *intr_dev) 193static irqreturn_t eisa_irq(int wax_irq, void *intr_dev)