diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-18 00:46:35 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-18 00:46:35 +0200 |
| commit | aab8ad9ec81255ee08825bed36b57484052b94ea (patch) | |
| tree | c49b971a8c17c40a1dd5abcf3699b9809e7e2a5f /drivers/ide/setup-pci.c | |
| parent | ide: init hwif->{io_ports,irq} explicitly in legacy VLB host drivers (diff) | |
| download | linux-aab8ad9ec81255ee08825bed36b57484052b94ea.tar.xz linux-aab8ad9ec81255ee08825bed36b57484052b94ea.zip | |
ide: remove needless hwif->irq check from ide_hwif_configure()
ide_init_default_irq() is always zero for CONFIG_PCI=y so hwif->irq
check in ide_hwif_configure() can be safely removed.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/setup-pci.c')
| -rw-r--r-- | drivers/ide/setup-pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c index ea66c996e4ec..ee4a34b49062 100644 --- a/drivers/ide/setup-pci.c +++ b/drivers/ide/setup-pci.c @@ -371,7 +371,7 @@ static ide_hwif_t *ide_hwif_configure(struct pci_dev *dev, return NULL; /* no room in ide_hwifs[] */ memset(&hw, 0, sizeof(hw)); - hw.irq = hwif->irq ? hwif->irq : irq; + hw.irq = irq; hw.dev = &dev->dev; hw.chipset = d->chipset ? d->chipset : ide_pci; ide_std_init_ports(&hw, base, ctl | 2); |