This patch converts arm to use blk_end_request().
Signed-off-by: Kiyoshi Ueda <[email protected]>
Signed-off-by: Jun'ichi Nomura <[email protected]>
---
arch/arm/plat-omap/mailbox.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
Index: 2.6.24-rc3-mm2/arch/arm/plat-omap/mailbox.c
===================================================================
--- 2.6.24-rc3-mm2.orig/arch/arm/plat-omap/mailbox.c
+++ 2.6.24-rc3-mm2/arch/arm/plat-omap/mailbox.c
@@ -117,7 +117,8 @@ static void mbox_tx_work(struct work_str
spin_lock(q->queue_lock);
blkdev_dequeue_request(rq);
- end_that_request_last(rq, 0);
+ if (__blk_end_request(rq, 0, 0))
+ BUG();
spin_unlock(q->queue_lock);
}
}
@@ -151,7 +152,8 @@ static void mbox_rx_work(struct work_str
spin_lock_irqsave(q->queue_lock, flags);
blkdev_dequeue_request(rq);
- end_that_request_last(rq, 0);
+ if (__blk_end_request(rq, 0, 0))
+ BUG();
spin_unlock_irqrestore(q->queue_lock, flags);
mbox->rxq->callback((void *)msg);
@@ -265,7 +267,8 @@ omap_mbox_read(struct device *dev, struc
spin_lock_irqsave(q->queue_lock, flags);
blkdev_dequeue_request(rq);
- end_that_request_last(rq, 0);
+ if (__blk_end_request(rq, 0, 0))
+ BUG();
spin_unlock_irqrestore(q->queue_lock, flags);
if (unlikely(mbox_seq_test(mbox, *p))) {