From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Thu, 17 Apr 2008 22:46:35 +0000 (+0200)
Subject: ide: remove needless hwif->irq check from ide_hwif_configure()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=aab8ad9ec81255ee08825bed36b57484052b94ea;p=linux-beck.git

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>
---

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);