diff --git a/sys/alpha/pci/pcibus.c b/sys/alpha/pci/pcibus.c index 58363fa82d06..71a3eb15954d 100644 --- a/sys/alpha/pci/pcibus.c +++ b/sys/alpha/pci/pcibus.c @@ -40,7 +40,6 @@ #include #include -#include #include #include #include @@ -81,8 +80,6 @@ SYSCTL_LONG(_hw_chipset, OID_AUTO, hae_mask, CTLFLAG_RD, &chipset_hae_mask, 0, int alpha_pci_route_interrupt(device_t bus, device_t dev, int pin) { - int intline = 255; - /* * Validate requested pin number. */ @@ -90,10 +87,8 @@ alpha_pci_route_interrupt(device_t bus, device_t dev, int pin) return(255); if (platform.pci_intr_route) - intline = platform.pci_intr_route(bus, dev, pin); - if (intline == 255) - intline = pci_read_config(dev, PCIR_INTLINE, 1); - return intline; + return(platform.pci_intr_route(bus, dev, pin)); + return(255); } #ifdef DEV_ISA diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index c4b29514c1d4..3da4d2996265 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -1207,11 +1207,7 @@ pci_alloc_resource(device_t dev, device_t child, int type, int *rid, * If device doesn't have an interrupt routed, and is deserving of * an interrupt, try to assign it one. */ - if ((type == SYS_RES_IRQ) -#ifndef __alpha__ - && (cfg->intline == 255) && (cfg->intpin != 0) -#endif - ) { + if ((type == SYS_RES_IRQ) && (cfg->intline == 255) && (cfg->intpin != 0)) { cfg->intline = PCIB_ROUTE_INTERRUPT(device_get_parent(dev), child, cfg->intpin); if (cfg->intline != 255) {