Commit 8a0e7e14 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: move hwif->rqsize init from ide_init_queue() to init_irq() 



Move hwif->rqsize init from ide_init_queue() to init_irq().

There should be no functionality changes caused by this patch.

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent c5d70cc7

drivers/ide/ide-probe.c

+8 −7
Original line number Diff line number Diff line
@@ -881,13 +881,6 @@ static int ide_init_queue(ide_drive_t *drive) 
	q->queuedata = drive;

	blk_queue_segment_boundary(q, 0xffff);



	if (!hwif->rqsize) {

		if ((hwif->host_flags & IDE_HFLAG_NO_LBA48) ||

		    (hwif->host_flags & IDE_HFLAG_NO_LBA48_DMA))

			hwif->rqsize = 256;

		else

			hwif->rqsize = 65536;

	}

	if (hwif->rqsize < max_sectors)

		max_sectors = hwif->rqsize;

	blk_queue_max_sectors(q, max_sectors);
@@ -1019,6 +1012,14 @@ static int init_irq (ide_hwif_t *hwif) 
	       		goto out_unlink;

	}



	if (!hwif->rqsize) {

		if ((hwif->host_flags & IDE_HFLAG_NO_LBA48) ||

		    (hwif->host_flags & IDE_HFLAG_NO_LBA48_DMA))

			hwif->rqsize = 256;

		else

			hwif->rqsize = 65536;

	}



	/*

	 * For any present drive:

	 * - allocate the block device queue