aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-probe.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-24 18:22:49 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-24 18:22:49 -0400
commit80d15a607ae95dd0514ab1ab5ea1058a3a585f2b (patch)
treeb3f19c18865f1a1c2f51d4f092bbead9017f91f3 /drivers/ide/ide-probe.c
parent1b166ae7bb9610cdd3c4c66b960aa04004054e41 (diff)
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>
Diffstat (limited to 'drivers/ide/ide-probe.c')
-rw-r--r--drivers/ide/ide-probe.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index a51ad2bd62b..80967307f2b 100644
--- 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,
1183 if (d->init_iops) 1183 if (d->init_iops)
1184 d->init_iops(hwif); 1184 d->init_iops(hwif);
1185 1185
1186 if ((!hwif->irq && (d->host_flags & IDE_HFLAG_LEGACY_IRQS)) ||
1187 (d->host_flags & IDE_HFLAG_FORCE_LEGACY_IRQS))
1188 hwif->irq = port ? 15 : 14;
1189
1190 /* ->host_flags may be set by ->init_iops (or even earlier...) */ 1186 /* ->host_flags may be set by ->init_iops (or even earlier...) */
1191 hwif->host_flags |= d->host_flags; 1187 hwif->host_flags |= d->host_flags;
1192 hwif->pio_mask = d->pio_mask; 1188 hwif->pio_mask = d->pio_mask;