1 files changed, 7 insertions, 10 deletions

diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c
index ff0448e4bf03..da403b6a7f43 100644
--- a/drivers/block/sx8.c
+++ b/drivers/block/sx8.c
@@ -749,8 +749,7 @@ static inline void carm_end_request_queued(struct carm_host *host,
         struct request *req = crq->rq;
         int rc;
 
-        rc = __blk_end_request(req, error, blk_rq_bytes(req));
-        assert(rc == 0);
+        __blk_end_request_all(req, error);
 
         rc = carm_put_request(host, crq);
         assert(rc == 0);
@@ -811,12 +810,10 @@ static void carm_oob_rq_fn(struct request_queue *q)
 
         while (1) {
                 DPRINTK("get req\n");
-                rq = elv_next_request(q);
+                rq = blk_fetch_request(q);
                 if (!rq)
                         break;
 
-                blkdev_dequeue_request(rq);
-
                 crq = rq->special;
                 assert(crq != NULL);
                 assert(crq->rq == rq);
@@ -847,7 +844,7 @@ static void carm_rq_fn(struct request_queue *q)
 
 queue_one_request:
         VPRINTK("get req\n");
-        rq = elv_next_request(q);
+        rq = blk_peek_request(q);
         if (!rq)
                 return;
 
@@ -858,7 +855,7 @@ queue_one_request:
         }
         crq->rq = rq;
 
-        blkdev_dequeue_request(rq);
+        blk_start_request(rq);
 
         if (rq_data_dir(rq) == WRITE) {
                 writing = 1;
@@ -904,10 +901,10 @@ queue_one_request:
         msg->sg_count   = n_elem;
         msg->sg_type    = SGT_32BIT;
         msg->handle     = cpu_to_le32(TAG_ENCODE(crq->tag));
-        msg->lba        = cpu_to_le32(rq->sector & 0xffffffff);
-        tmp             = (rq->sector >> 16) >> 16;
+        msg->lba        = cpu_to_le32(blk_rq_pos(rq) & 0xffffffff);
+        tmp             = (blk_rq_pos(rq) >> 16) >> 16;
         msg->lba_high   = cpu_to_le16( (u16) tmp );
-        msg->lba_count  = cpu_to_le16(rq->nr_sectors);
+        msg->lba_count  = cpu_to_le16(blk_rq_sectors(rq));
 
         msg_size = sizeof(struct carm_msg_rw) - sizeof(msg->sg);
         for (i = 0; i < n_elem; i++) {