diff options
| author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2003-04-07 19:38:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2003-04-07 19:38:11 -0700 |
| commit | fab803068b99b7e60a5d384671f39b78d472a66b (patch) | |
| tree | a897d362c77b9ad48361c56dd6f7d31a4ebb8c32 | |
| parent | 667c52f5ae3ad16c2efbf9ffee68f4b6d72f7494 (diff) | |
[PATCH] clean up pci interrupt line whacking
| -rw-r--r-- | drivers/ide/pci/hpt366.c | 9 | ||||
| -rw-r--r-- | drivers/ide/pci/pdc202xx_new.c | 9 |
2 files changed, 4 insertions, 14 deletions
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c index 6c2861b9a997..ccd51cd20bbc 100644 --- a/drivers/ide/pci/hpt366.c +++ b/drivers/ide/pci/hpt366.c @@ -1106,13 +1106,10 @@ static void __init init_setup_hpt374 (struct pci_dev *dev, ide_pci_device_t *d) ((findev->devfn - dev->devfn) == 1) && (PCI_FUNC(findev->devfn) & 1)) { u8 irq = 0, irq2 = 0; - pci_read_config_byte(dev, PCI_INTERRUPT_LINE, &irq); - pci_read_config_byte(findev, PCI_INTERRUPT_LINE, &irq2); - if (irq != irq2) { - pci_write_config_byte(findev, - PCI_INTERRUPT_LINE, irq); + if (findev->irq != dev->irq) { + /* FIXME: we need a core pci_set_interrupt() */ findev->irq = dev->irq; - printk("%s: pci-config space interrupt " + printk(KERN_WARNING "%s: pci-config space interrupt " "fixed.\n", d->name); } ide_setup_pci_devices(dev, findev, d); diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c index 9cb6895952f4..fe9920882eb9 100644 --- a/drivers/ide/pci/pdc202xx_new.c +++ b/drivers/ide/pci/pdc202xx_new.c @@ -592,15 +592,8 @@ static void __init init_setup_pdc20270 (struct pci_dev *dev, ide_pci_device_t *d if ((findev->vendor == dev->vendor) && (findev->device == dev->device) && (PCI_SLOT(findev->devfn) & 2)) { - u8 irq = 0, irq2 = 0; - pci_read_config_byte(dev, - PCI_INTERRUPT_LINE, &irq); - pci_read_config_byte(findev, - PCI_INTERRUPT_LINE, &irq2); - if (irq != irq2) { + if (findev->irq != dev->irq) { findev->irq = dev->irq; - pci_write_config_byte(findev, - PCI_INTERRUPT_LINE, irq); } ide_setup_pci_devices(dev, findev, d); return; |