mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
block: Rename blk_queue_max_sectors to blk_queue_max_hw_sectors
The block layer calling convention is blk_queue_<limit name>. blk_queue_max_sectors predates this practice, leading to some confusion. Rename the function to appropriately reflect that its intended use is to set max_hw_sectors. Also introduce a temporary wrapper for backwards compability. This can be removed after the merge window is closed. Signed-off-by: Martin K. Petersen <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
This commit is contained in:
parent
eb28d31bc9
commit
086fa5ff08
41 changed files with 60 additions and 53 deletions
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
|
|
|
|||
Loading…
Reference in a new issue