block: Finalize conversion of block limits functions

Remove compatibility wrappers and update remaining drivers.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

2 files changed, 2 insertions, 4 deletions

diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index 459f1bc25a7b..c5f22bb0a48e 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -2533,7 +2533,6 @@ static bool DAC960_RegisterBlockDevice(DAC960_Controller_T *Controller)
         Controller->RequestQueue[n] = RequestQueue;
         blk_queue_bounce_limit(RequestQueue, Controller->BounceBufferLimit);
         RequestQueue->queuedata = Controller;
-        blk_queue_max_hw_segments(RequestQueue, Controller->DriverScatterGatherLimit);
         blk_queue_max_segments(RequestQueue, Controller->DriverScatterGatherLimit);
         blk_queue_max_hw_sectors(RequestQueue, Controller->MaxBlocksPerCommand);
         disk->queue = RequestQueue;
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 3c64af05fa82..653817ceeedd 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -347,14 +347,13 @@ static int __devinit virtblk_probe(struct virtio_device *vdev)
         set_capacity(vblk->disk, cap);
 
         /* We can handle whatever the host told us to handle. */
-        blk_queue_max_phys_segments(q, vblk->sg_elems-2);
-        blk_queue_max_hw_segments(q, vblk->sg_elems-2);
+        blk_queue_max_segments(q, vblk->sg_elems-2);
 
         /* No need to bounce any requests */
         blk_queue_bounce_limit(q, BLK_BOUNCE_ANY);
 
         /* No real sector limit. */
-        blk_queue_max_sectors(q, -1U);
+        blk_queue_max_hw_sectors(q, -1U);
 
         /* Host can optionally specify maximum segment size and number of
          * segments. */