3 files changed, 5 insertions, 6 deletions

diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index 7f878017b736..3b128dce9c3a 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -679,7 +679,7 @@ static void ide_disk_setup(ide_drive_t *drive)
                 if (max_s > hwif->rqsize)
                         max_s = hwif->rqsize;
 
-                blk_queue_max_sectors(q, max_s);
+                blk_queue_max_hw_sectors(q, max_s);
         }
 
         printk(KERN_INFO "%s: max request size: %dKiB\n", drive->name,
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index fefbdfc8db06..efd907623469 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -486,7 +486,7 @@ static void ide_floppy_setup(ide_drive_t *drive)
                 drive->atapi_flags |= IDE_AFLAG_ZIP_DRIVE;
                 /* This value will be visible in the /proc/ide/hdx/settings */
                 drive->pc_delay = IDEFLOPPY_PC_DELAY;
-                blk_queue_max_sectors(drive->queue, 64);
+                blk_queue_max_hw_sectors(drive->queue, 64);
         }
 
         /*
@@ -494,7 +494,7 @@ static void ide_floppy_setup(ide_drive_t *drive)
          * nasty clicking noises without it, so please don't remove this.
          */
         if (strncmp((char *)&id[ATA_ID_PROD], "IOMEGA Clik!", 11) == 0) {
-                blk_queue_max_sectors(drive->queue, 64);
+                blk_queue_max_hw_sectors(drive->queue, 64);
                 drive->atapi_flags |= IDE_AFLAG_CLIK_DRIVE;
                 /* IOMEGA Clik! drives do not support lock/unlock commands */
                 drive->dev_flags &= ~IDE_DFLAG_DOORLOCKING;
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 4d76ba473097..f8c1ae6ad74c 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -774,7 +774,7 @@ static int ide_init_queue(ide_drive_t *drive)
 
         if (hwif->rqsize < max_sectors)
                 max_sectors = hwif->rqsize;
-        blk_queue_max_sectors(q, max_sectors);
+        blk_queue_max_hw_sectors(q, max_sectors);
 
 #ifdef CONFIG_PCI
         /* When we have an IOMMU, we may have a problem where pci_map_sg()
@@ -790,8 +790,7 @@ static int ide_init_queue(ide_drive_t *drive)
                 max_sg_entries >>= 1;
 #endif /* CONFIG_PCI */
 
-        blk_queue_max_hw_segments(q, max_sg_entries);
-        blk_queue_max_phys_segments(q, max_sg_entries);
+        blk_queue_max_segments(q, max_sg_entries);
 
         /* assign drive queue */
         drive->queue = q;