mtip32xx: make it work with new make_request_fn scheme

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c
index 1cf2b0443571f273bd57d8a0fc449c06803c36f4..3ec3d3483dd15181a5b7fd142752bdbcf5a7a2aa 100644 (file)
--- a/drivers/block/mtip32xx/mtip32xx.c
+++ b/drivers/block/mtip32xx/mtip32xx.c
@@ -2993,7 +2993,7 @@ static const struct block_device_operations mtip_block_ops = {
  * return value
  *     0
  */
-static int mtip_make_request(struct request_queue *queue, struct bio *bio)
+static void mtip_make_request(struct request_queue *queue, struct bio *bio)
 {
        struct driver_data *dd = queue->queuedata;
        struct scatterlist *sg;
@@ -3004,12 +3004,12 @@ static int mtip_make_request(struct request_queue *queue, struct bio *bio)
        if (unlikely(!bio_has_data(bio))) {
                blk_queue_flush(queue, 0);
                bio_endio(bio, 0);
-               return 0;
+               return;
        }
 
        if (unlikely(atomic_read(&dd->eh_active))) {
                bio_endio(bio, -EBUSY);
-               return 0;
+               return;
        }
 
        sg = mtip_hw_get_scatterlist(dd, &tag);
@@ -3021,7 +3021,7 @@ static int mtip_make_request(struct request_queue *queue, struct bio *bio)
                                "Maximum number of SGL entries exceeded");
                        bio_io_error(bio);
                        mtip_hw_release_scatterlist(dd, tag);
-                       return 0;
+                       return;
                }
 
                /* Create the scatter list for this bio. */
@@ -3045,8 +3045,6 @@ static int mtip_make_request(struct request_queue *queue, struct bio *bio)
        } else {
                bio_io_error(bio);
        }
-
-       return 0;
 }
 
 /*