ide: handle IDE_HFLAG[_FORCE]_LEGACY_IRQS in ide_pci_init_{one,two}()

Move handling of IDE_HFLAG[_FORCE]_LEGACY_IRQS from ide_init_port()
to ide_pci_init_{one,two}().

There should be no functional changes caused by this patch.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index a51ad2bd62b4300ce0e8ebbada74068629aa3cbb..80967307f2bb3706bb4e664ad62c42a5957b58dd 100644 (file)
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -1183,10 +1183,6 @@ static void ide_init_port(ide_hwif_t *hwif, unsigned int port,
        if (d->init_iops)
                d->init_iops(hwif);
 
-       if ((!hwif->irq && (d->host_flags & IDE_HFLAG_LEGACY_IRQS)) ||
-           (d->host_flags & IDE_HFLAG_FORCE_LEGACY_IRQS))
-               hwif->irq = port ? 15 : 14;
-
        /* ->host_flags may be set by ->init_iops (or even earlier...) */
        hwif->host_flags |= d->host_flags;
        hwif->pio_mask = d->pio_mask;

diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
index e85d1ed29c2ac005d37928d61e0d439534f8c9dd..9482288e861033f47b47dc2a96f4a0f0ab11b5c5 100644 (file)
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
@@ -570,6 +570,12 @@ int ide_pci_init_one(struct pci_dev *dev, const struct ide_port_info *d,
        /* fixup IRQ */
        hw[1].irq = hw[0].irq = ret;
 
+       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;
+       }
+
        ret = ide_host_register(host, d, hws);
        if (ret)
                ide_host_free(host);
@@ -620,6 +626,12 @@ int ide_pci_init_two(struct pci_dev *dev1, struct pci_dev *dev2,
 
                /* fixup IRQ */
                hw[i*2 + 1].irq = hw[i*2].irq = ret;
+
+               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;
+               }
        }
 
        ret = ide_host_register(host, d, hws);