[PATCH 14/22] ide: move hwif->rqsize init from ide_init_queue() to init_irq()

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: <linux-ide@...>
Cc: Bartlomiej Zolnierkiewicz <bzolnier@...>, <linux-kernel@...>
Date: Wednesday, January 16, 2008 - 7:27 pm

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

There should be no functionality changes caused by this patch.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
---
 drivers/ide/ide-probe.c |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

Index: b/drivers/ide/ide-probe.c
===================================================================
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -881,13 +881,6 @@ static int ide_init_queue(ide_drive_t *d
 	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
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 00/22] ide: even more IDE probing code rework, Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:25 pm)
[PATCH 22/22] ide: move create_proc_ide_drives() call to ide..., Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:28 pm)
[PATCH 21/22] ide: move hwif-&gt;present check out from ide_..., Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:28 pm)
[PATCH 20/22] ide: factor out devices setup from ide_acpi_in..., Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:28 pm)
[PATCH 19/22] ide-acpi: remove dead code from do_drive_get_G..., Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:28 pm)
[PATCH 15/22] ide: factor out adding drive to hwgroup from i..., Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:27 pm)
[PATCH 18/22] ide-acpi: remove needless exports, Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:28 pm)
[PATCH 17/22] ide: move ide_acpi_init() call to ide_device_a..., Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:28 pm)
[PATCH 16/22] ide: factor out devices setup from init_irq(), Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:27 pm)
[PATCH 14/22] ide: move hwif->rqsize init from ide_init_q..., Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:27 pm)
[PATCH 13/22] ide: merge init_gendisk() into hwif_register_d..., Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:27 pm)
[PATCH 12/22] ide: call init_gendisk() after ide_acpi_init(), Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:27 pm)
[PATCH 11/22] ide: move blk_register_region() call out from ..., Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:27 pm)
[PATCH 10/22] ide: skip not present devices in init_gendisk(), Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:27 pm)
[PATCH 09/22] ide: remove incorrect init_gendisk() comment, Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:27 pm)
[PATCH 08/22] ide: add -&gt;init_port_devs method to ide_hwif_t, Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:27 pm)
[PATCH 07/22] ide: add IDE_HFLAG_NO_{IO32_BIT,UNMASK_IRQS} h..., Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:26 pm)
[PATCH 06/22] ide: factor out code initializing devices from..., Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:26 pm)
[PATCH 05/22] ide: fix ide_unregister() usage in host drivers, Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:26 pm)
[PATCH 04/22] ide: add ide_deprecated_find_port() helper, Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:26 pm)
Re: [PATCH 04/22] ide: add ide_deprecated_find_port() helper, Sergei Shtylyov, (Wed May 21, 10:29 am)
Re: [PATCH 04/22] ide: add ide_deprecated_find_port() helper, Bartlomiej Zolnierkiewicz..., (Tue May 27, 2:36 pm)
[PATCH 03/22] ide: add 'init_default' and 'restore' argument..., Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:26 pm)
[PATCH 02/22] ide: remove redundant init_hwif_default() call..., Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:26 pm)
[PATCH 01/22] ide: remove redundant hwif-&gt;present check f..., Bartlomiej Zolnierkiewicz..., (Wed Jan 16, 7:26 pm)