linux-ide.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
To: linux-ide@vger.kernel.org
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>,
	linux-kernel@vger.kernel.org
Subject: [PATCH 7/9] ide: move ->rqsize init from init_irq() to ide_init_port()
Date: Tue, 06 Jan 2009 19:36:02 +0100	[thread overview]
Message-ID: <20090106183602.21193.67001.sendpatchset@localhost.localdomain> (raw)
In-Reply-To: <20090106183520.21193.63704.sendpatchset@localhost.localdomain>

From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Subject: [PATCH] ide: move ->rqsize init from init_irq() to ide_init_port()

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

Index: b/drivers/ide/ide-probe.c
===================================================================
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -958,14 +958,6 @@ static int init_irq (ide_hwif_t *hwif)
 	if (request_irq(hwif->irq, &ide_intr, sa, hwif->name, hwif))
 		goto out_up;
 
-	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 !defined(__mc68000__)
 	printk(KERN_INFO "%s at 0x%03lx-0x%03lx,0x%03lx on irq %d", hwif->name,
 		io_ports->data_addr, io_ports->status_addr,
@@ -1242,6 +1234,13 @@ static void ide_init_port(ide_hwif_t *hw
 
 	if (d->max_sectors)
 		hwif->rqsize = d->max_sectors;
+	else {
+		if ((hwif->host_flags & IDE_HFLAG_NO_LBA48) ||
+		    (hwif->host_flags & IDE_HFLAG_NO_LBA48_DMA))
+			hwif->rqsize = 256;
+		else
+			hwif->rqsize = 65536;
+	}
 
 	/* call chipset specific routine for each enabled port */
 	if (d->init_hwif)

  parent reply	other threads:[~2009-01-06 18:35 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-01-06 18:35 [PATCH 1/9] via82cxxx: fix cable warning message Bartlomiej Zolnierkiewicz
2009-01-06 18:35 ` [PATCH 2/9] sl82c105: remove dead code Bartlomiej Zolnierkiewicz
2009-01-11 21:14   ` Sergei Shtylyov
2009-01-12 17:59     ` Bartlomiej Zolnierkiewicz
2009-01-06 18:35 ` [PATCH 4/9] ide: fix IDE_DFLAG_NO_IO_32BIT handling Bartlomiej Zolnierkiewicz
2009-01-06 18:35 ` [PATCH 5/9] ide: move ide_pktcmd_tf_load() to ide-atapi.c Bartlomiej Zolnierkiewicz
2009-01-11 21:18   ` Sergei Shtylyov
2009-01-06 18:35 ` [PATCH 6/9] ide: no need to touch local IRQs in ide_probe_port() Bartlomiej Zolnierkiewicz
2009-01-06 18:36 ` Bartlomiej Zolnierkiewicz [this message]
2009-01-11 20:58   ` [PATCH 7/9] ide: move ->rqsize init from init_irq() to ide_init_port() Sergei Shtylyov
2009-01-14 17:25     ` Bartlomiej Zolnierkiewicz
2009-01-22 14:52       ` Bartlomiej Zolnierkiewicz
2009-01-06 18:36 ` [PATCH 8/9] ide: move ->lock and ->timer init from init_irq() to ide_init_port_data() Bartlomiej Zolnierkiewicz
2009-01-06 18:36 ` [PATCH 9/9] ide: init_irq() doesn't need to hold ide_cfg_mtx Bartlomiej Zolnierkiewicz
2009-01-11 21:17 ` [PATCH 1/9] via82cxxx: fix cable warning message Sergei Shtylyov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20090106183602.21193.67001.sendpatchset@localhost.localdomain \
    --to=bzolnier@gmail.com \
    --cc=linux-ide@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).