Commit ca9fc2ad authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds

[PATCH] M68k IRQ API updates [18/20]

M68k parport drivers: Update to the new irq API (from Roman Zippel and me) [18/20]
parent 9f2e4827
...@@ -138,9 +138,10 @@ static unsigned char amiga_read_status(struct parport *p) ...@@ -138,9 +138,10 @@ static unsigned char amiga_read_status(struct parport *p)
} }
/* as this ports irq handling is already done, we use a generic funktion */ /* as this ports irq handling is already done, we use a generic funktion */
static void amiga_interrupt(int irq, void *dev_id, struct pt_regs *regs) static irqreturn_t amiga_interrupt(int irq, void *dev_id, struct pt_regs *regs)
{ {
parport_generic_irq(irq, (struct parport *) dev_id, regs); parport_generic_irq(irq, (struct parport *) dev_id, regs);
return IRQ_HANDLED;
} }
static void amiga_enable_irq(struct parport *p) static void amiga_enable_irq(struct parport *p)
......
...@@ -103,10 +103,11 @@ parport_atari_restore_state(struct parport *p, struct parport_state *s) ...@@ -103,10 +103,11 @@ parport_atari_restore_state(struct parport *p, struct parport_state *s)
{ {
} }
static void static irqreturn_t
parport_atari_interrupt(int irq, void *dev_id, struct pt_regs *regs) parport_atari_interrupt(int irq, void *dev_id, struct pt_regs *regs)
{ {
parport_generic_irq(irq, (struct parport *) dev_id, regs); parport_generic_irq(irq, (struct parport *) dev_id, regs);
return IRQ_HANDLED;
} }
static void static void
......
...@@ -211,7 +211,7 @@ static void mfc3_change_mode( struct parport *p, int m) ...@@ -211,7 +211,7 @@ static void mfc3_change_mode( struct parport *p, int m)
static int use_cnt = 0; static int use_cnt = 0;
static void mfc3_interrupt(int irq, void *dev_id, struct pt_regs *regs) static irqreturn_t mfc3_interrupt(int irq, void *dev_id, struct pt_regs *regs)
{ {
int i; int i;
...@@ -221,6 +221,7 @@ static void mfc3_interrupt(int irq, void *dev_id, struct pt_regs *regs) ...@@ -221,6 +221,7 @@ static void mfc3_interrupt(int irq, void *dev_id, struct pt_regs *regs)
dummy = pia(this_port[i])->pprb; /* clear irq bit */ dummy = pia(this_port[i])->pprb; /* clear irq bit */
parport_generic_irq(irq, this_port[i], regs); parport_generic_irq(irq, this_port[i], regs);
} }
return IRQ_HANDLED;
} }
static void mfc3_enable_irq(struct parport *p) static void mfc3_enable_irq(struct parport *p)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment