Commit d3877325 authored by Neil Brown's avatar Neil Brown Committed by Linus Torvalds

[PATCH] Update umem to new request_irq interface

request_irq requires a handler that returns irqreturn_t,
so mm_interrupt now returns the appropriate value
parent 5471b3aa
...@@ -573,7 +573,7 @@ static int mm_make_request(request_queue_t *q, struct bio *bio) ...@@ -573,7 +573,7 @@ static int mm_make_request(request_queue_t *q, struct bio *bio)
-- mm_interrupt -- mm_interrupt
----------------------------------------------------------------------------------- -----------------------------------------------------------------------------------
*/ */
static void mm_interrupt(int irq, void *__card, struct pt_regs *regs) static irqreturn_t mm_interrupt(int irq, void *__card, struct pt_regs *regs)
{ {
struct cardinfo *card = (struct cardinfo *) __card; struct cardinfo *card = (struct cardinfo *) __card;
unsigned int dma_status; unsigned int dma_status;
...@@ -585,7 +585,7 @@ HW_TRACE(0x30); ...@@ -585,7 +585,7 @@ HW_TRACE(0x30);
if (!(dma_status & (DMASCR_ERROR_MASK | DMASCR_CHAIN_COMPLETE))) { if (!(dma_status & (DMASCR_ERROR_MASK | DMASCR_CHAIN_COMPLETE))) {
/* interrupt wasn't for me ... */ /* interrupt wasn't for me ... */
return; return IRQ_NONE;
} }
/* clear COMPLETION interrupts */ /* clear COMPLETION interrupts */
...@@ -663,6 +663,7 @@ HW_TRACE(0x30); ...@@ -663,6 +663,7 @@ HW_TRACE(0x30);
HW_TRACE(0x36); HW_TRACE(0x36);
return IRQ_HANDLED;
} }
/* /*
----------------------------------------------------------------------------------- -----------------------------------------------------------------------------------
......
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