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 06/12] ide: use pci_get_legacy_ide_irq() in ide_pci_init_{one,two}()
Date: Mon, 19 Jan 2009 15:14:10 +0100	[thread overview]
Message-ID: <20090119141410.27613.54355.sendpatchset@localhost.localdomain> (raw)
In-Reply-To: <20090119141330.27613.34546.sendpatchset@localhost.localdomain>

From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Subject: [PATCH] ide: use pci_get_legacy_ide_irq() in ide_pci_init_{one,two}()

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

Index: b/drivers/ide/setup-pci.c
===================================================================
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
@@ -572,8 +572,8 @@ int ide_pci_init_one(struct pci_dev *dev
 
 	if ((ret == 0 && (d->host_flags & IDE_HFLAG_LEGACY_IRQS)) ||
 	    (d->host_flags & IDE_HFLAG_FORCE_LEGACY_IRQS)) {
-		hw[0].irq = 14;
-		hw[1].irq = 15;
+		hw[0].irq = pci_get_legacy_ide_irq(dev, 0);
+		hw[1].irq = pci_get_legacy_ide_irq(dev, 1);
 	}
 
 	ret = ide_host_register(host, d, hws);
@@ -629,8 +629,8 @@ int ide_pci_init_two(struct pci_dev *dev
 
 		if ((ret == 0 && (d->host_flags & IDE_HFLAG_LEGACY_IRQS)) ||
 		    (d->host_flags & IDE_HFLAG_FORCE_LEGACY_IRQS)) {
-			hw[i*2].irq = 14;
-			hw[i*2 + 1].irq = 15;
+			hw[i*2].irq = pci_get_legacy_ide_irq(pdev[i], 0);
+			hw[i*2 + 1].irq = pci_get_legacy_ide_irq(pdev[i], 1);
 		}
 	}
 

  parent reply	other threads:[~2009-01-19 14:14 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-01-19 14:13 [PATCH 00/12] ide: IRQ setup fixes/sanitizations Bartlomiej Zolnierkiewicz
2009-01-19 14:13 ` [PATCH 01/12] amd74xx: use ide_pci_is_in_compatibility_mode() Bartlomiej Zolnierkiewicz
2009-01-19 14:13 ` [PATCH 02/12] ns87415: use pci_get_legacy_ide_irq() Bartlomiej Zolnierkiewicz
2009-01-19 14:13 ` [PATCH 03/12] ns87415: small ->init_hwif cleanup Bartlomiej Zolnierkiewicz
2009-01-19 14:13 ` [PATCH 04/12] trm290: " Bartlomiej Zolnierkiewicz
2009-01-19 14:14 ` [PATCH 05/12] ide: handle IDE_HFLAG[_FORCE]_LEGACY_IRQS in ide_pci_init_{one,two}() Bartlomiej Zolnierkiewicz
2009-01-19 14:14 ` Bartlomiej Zolnierkiewicz [this message]
2009-01-19 14:14 ` [PATCH 07/12] ide: use ide_pci_is_in_compatibility_mode() " Bartlomiej Zolnierkiewicz
2009-01-19 14:14 ` [PATCH 08/12] ide: remove no longer needed IDE_HFLAG[_FORCE]_LEGACY_IRQS Bartlomiej Zolnierkiewicz
2009-01-19 14:36   ` Borislav Petkov
2009-01-19 14:41     ` Bartlomiej Zolnierkiewicz
2009-01-19 14:14 ` [PATCH 09/12] amd74xx: remove no longer needed ->init_hwif method Bartlomiej Zolnierkiewicz
2009-01-19 14:14 ` [PATCH 10/12] ide: remove no longer needed IRQ fallback code from hwif_init() Bartlomiej Zolnierkiewicz
2009-01-19 14:15 ` [PATCH 11/12] ide: remove no longer needed IRQ auto-probing from try_to_identify() Bartlomiej Zolnierkiewicz
2009-01-19 14:15 ` [PATCH 12/12] ide: remove try_to_identify() wrapper Bartlomiej Zolnierkiewicz

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=20090119141410.27613.54355.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).