These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / xtensa / platforms / iss / simdisk.c

diff --git a/kernel/arch/xtensa/platforms/iss/simdisk.c b/kernel/arch/xtensa/platforms/iss/simdisk.c
index 48eebac..3c3ace2 100644 (file)
--- a/kernel/arch/xtensa/platforms/iss/simdisk.c
+++ b/kernel/arch/xtensa/platforms/iss/simdisk.c
@@ -101,8 +101,9 @@ static void simdisk_transfer(struct simdisk *dev, unsigned long sector,
        spin_unlock(&dev->lock);
 }
 
-static int simdisk_xfer_bio(struct simdisk *dev, struct bio *bio)
+static blk_qc_t simdisk_make_request(struct request_queue *q, struct bio *bio)
 {
+       struct simdisk *dev = q->queuedata;
        struct bio_vec bvec;
        struct bvec_iter iter;
        sector_t sector = bio->bi_iter.bi_sector;
@@ -116,17 +117,11 @@ static int simdisk_xfer_bio(struct simdisk *dev, struct bio *bio)
                sector += len;
                __bio_kunmap_atomic(buffer);
        }
-       return 0;
-}
 
-static void simdisk_make_request(struct request_queue *q, struct bio *bio)
-{
-       struct simdisk *dev = q->queuedata;
-       int status = simdisk_xfer_bio(dev, bio);
-       bio_endio(bio, status);
+       bio_endio(bio);
+       return BLK_QC_T_NONE;
 }
 
-
 static int simdisk_open(struct block_device *bdev, fmode_t mode)
 {
        struct simdisk *dev = bdev->bd_disk->private_data;