block: Consolidate phys_segment and hw_segment limits

Except for SCSI no device drivers distinguish between physical and
hardware segment limits.  Consolidate the two into a single segment
limit.

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

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c
index d033cfdb516f..2658b1484a2c 100644
--- a/drivers/message/i2o/i2o_block.c
+++ b/drivers/message/i2o/i2o_block.c
@@ -1065,9 +1065,8 @@ static int i2o_block_probe(struct device *dev)
         queue = gd->queue;
         queue->queuedata = i2o_blk_dev;
 
-        blk_queue_max_phys_segments(queue, I2O_MAX_PHYS_SEGMENTS);
         blk_queue_max_hw_sectors(queue, max_sectors);
-        blk_queue_max_hw_segments(queue, i2o_sg_tablesize(c, body_size));
+        blk_queue_max_segments(queue, i2o_sg_tablesize(c, body_size));
 
         osm_debug("max sectors = %d\n", queue->max_sectors);
         osm_debug("phys segments = %d\n", queue->max_phys_segments);