Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / plat-omap / mailbox.c

diff --git a/arch/arm/plat-omap/mailbox.c b/arch/arm/plat-omap/mailbox.c
index 7652c4e0c1fe7bfa5bf30899c8c1386b575da64e..6f33f58bca4573184aaa7b5147b02d707ab6e496 100644 (file)
--- a/arch/arm/plat-omap/mailbox.c
+++ b/arch/arm/plat-omap/mailbox.c
@@ -116,8 +116,8 @@ static void mbox_tx_work(struct work_struct *work)
                }
 
                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);
        }
 }
@@ -149,10 +149,8 @@ static void mbox_rx_work(struct work_struct *work)
 
                msg = (mbox_msg_t) rq->data;
 
-               spin_lock_irqsave(q->queue_lock, flags);
-               blkdev_dequeue_request(rq);
-               end_that_request_last(rq, 0);
-               spin_unlock_irqrestore(q->queue_lock, flags);
+               if (blk_end_request(rq, 0, 0))
+                       BUG();
 
                mbox->rxq->callback((void *)msg);
        }
@@ -212,7 +210,7 @@ static void __mbox_rx_interrupt(struct omap_mbox *mbox)
 
 static irqreturn_t mbox_interrupt(int irq, void *p)
 {
-       struct omap_mbox *mbox = (struct omap_mbox *)p;
+       struct omap_mbox *mbox = p;
 
        if (is_mbox_irq(mbox, IRQ_TX))
                __mbox_tx_interrupt(mbox);
@@ -263,10 +261,8 @@ omap_mbox_read(struct device *dev, struct device_attribute *attr, char *buf)
 
                *p = (mbox_msg_t) rq->data;
 
-               spin_lock_irqsave(q->queue_lock, flags);
-               blkdev_dequeue_request(rq);
-               end_that_request_last(rq, 0);
-               spin_unlock_irqrestore(q->queue_lock, flags);
+               if (blk_end_request(rq, 0, 0))
+                       BUG();
 
                if (unlikely(mbox_seq_test(mbox, *p))) {
                        pr_info("mbox: Illegal seq bit!(%08x) ignored\n", *p);