Commit 689d2617 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] v850: Use irqreturn_t on rte-me2-cb platform

From: miles@lsi.nec.co.jp (Miles Bader)

The cb_pic_handle_irq function on this platform hadn't been updated to
use irqreturn_t; do so.
parent b9023cd5
...@@ -217,8 +217,10 @@ void cb_pic_shutdown_irq (unsigned irq) ...@@ -217,8 +217,10 @@ void cb_pic_shutdown_irq (unsigned irq)
CB_PIC_INT1M &= ~(1 << (irq - CB_PIC_BASE_IRQ)); CB_PIC_INT1M &= ~(1 << (irq - CB_PIC_BASE_IRQ));
} }
static void cb_pic_handle_irq (int irq, void *dev_id, struct pt_regs *regs) static irqreturn_t cb_pic_handle_irq (int irq, void *dev_id,
struct pt_regs *regs)
{ {
irqreturn_t rval = IRQ_NONE;
unsigned status = CB_PIC_INTR; unsigned status = CB_PIC_INTR;
unsigned enable = CB_PIC_INT1M; unsigned enable = CB_PIC_INT1M;
...@@ -244,13 +246,16 @@ static void cb_pic_handle_irq (int irq, void *dev_id, struct pt_regs *regs) ...@@ -244,13 +246,16 @@ static void cb_pic_handle_irq (int irq, void *dev_id, struct pt_regs *regs)
/* Recursively call handle_irq to handle it. */ /* Recursively call handle_irq to handle it. */
handle_irq (irq, regs); handle_irq (irq, regs);
rval = IRQ_HANDLED;
} while (status); } while (status);
} }
CB_PIC_INTEN |= CB_PIC_INT1EN; CB_PIC_INTEN |= CB_PIC_INT1EN;
}
return rval;
}
static void irq_nop (unsigned irq) { } static void irq_nop (unsigned irq) { }
static unsigned cb_pic_startup_irq (unsigned irq) static unsigned cb_pic_startup_irq (unsigned irq)
......
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