diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-17 18:46:35 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-17 18:46:35 -0400 |
commit | aab8ad9ec81255ee08825bed36b57484052b94ea (patch) | |
tree | c49b971a8c17c40a1dd5abcf3699b9809e7e2a5f /drivers/ide/setup-pci.c | |
parent | dfd87842a97e848cb5d62a5249d3f479c5f92c4b (diff) |
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, | |||
371 | return NULL; /* no room in ide_hwifs[] */ | 371 | return NULL; /* no room in ide_hwifs[] */ |
372 | 372 | ||
373 | memset(&hw, 0, sizeof(hw)); | 373 | memset(&hw, 0, sizeof(hw)); |
374 | hw.irq = hwif->irq ? hwif->irq : irq; | 374 | hw.irq = irq; |
375 | hw.dev = &dev->dev; | 375 | hw.dev = &dev->dev; |
376 | hw.chipset = d->chipset ? d->chipset : ide_pci; | 376 | hw.chipset = d->chipset ? d->chipset : ide_pci; |
377 | ide_std_init_ports(&hw, base, ctl | 2); | 377 | ide_std_init_ports(&hw, base, ctl | 2); |