2 files changed, 10 insertions, 22 deletions

diff --git a/arch/arm/plat-omap/mailbox.c b/arch/arm/plat-omap/mailbox.c
index 45a77df668f1..1945ddfec18d 100644
--- 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);
         }
@@ -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);
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index b1a77b11f089..99f9f9605e9c 100644
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -475,17 +475,9 @@ static void do_ubd_request(struct request_queue * q);
 /* Only changed by ubd_init, which is an initcall. */
 int thread_fd = -1;
 
-static void ubd_end_request(struct request *req, int bytes, int uptodate)
+static void ubd_end_request(struct request *req, int bytes, int error)
 {
-        if (!end_that_request_first(req, uptodate, bytes >> 9)) {
-                struct ubd *dev = req->rq_disk->private_data;
-                unsigned long flags;
-
-                add_disk_randomness(req->rq_disk);
-                spin_lock_irqsave(&dev->lock, flags);
-                end_that_request_last(req, uptodate);
-                spin_unlock_irqrestore(&dev->lock, flags);
-        }
+        blk_end_request(req, error, bytes);
 }
 
 /* Callable only from interrupt context - otherwise you need to do
@@ -493,10 +485,10 @@ static void ubd_end_request(struct request *req, int bytes, int uptodate)
 static inline void ubd_finish(struct request *req, int bytes)
 {
         if(bytes < 0){
-                ubd_end_request(req, 0, 0);
+                ubd_end_request(req, 0, -EIO);
                 return;
         }
-        ubd_end_request(req, bytes, 1);
+        ubd_end_request(req, bytes, 0);
 }
 
 static LIST_HEAD(restart);