diff options
| author | Martin Reindl <martin@cvs.openbsd.org> | 2007-05-02 21:50:15 +0000 |
|---|---|---|
| committer | Martin Reindl <martin@cvs.openbsd.org> | 2007-05-02 21:50:15 +0000 |
| commit | 84840e390c09a82a67468bf3ec687c443abf414b (patch) | |
| tree | 1cff181114a3057d9b6f6354aecce26a6f25833e /sys/arch/alpha | |
| parent | 4f0e642a927afc9eec6de18505643baf54fcc340 (diff) | |
supply the real devicename to sio_intr_establish() instead a generic
platform interrupt string when establishing pciide interrupts
Diffstat (limited to 'sys/arch/alpha')
| -rw-r--r-- | sys/arch/alpha/pci/pci_550.c | 4 | ||||
| -rw-r--r-- | sys/arch/alpha/pci/pci_6600.c | 4 | ||||
| -rw-r--r-- | sys/arch/alpha/pci/pci_eb164.c | 4 | ||||
| -rw-r--r-- | sys/arch/alpha/pci/pci_up1000.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/alpha/pci/pci_550.c b/sys/arch/alpha/pci/pci_550.c index b7c712a9f30..ebd82eaf0f1 100644 --- a/sys/arch/alpha/pci/pci_550.c +++ b/sys/arch/alpha/pci/pci_550.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_550.c,v 1.16 2006/06/15 20:08:29 brad Exp $ */ +/* $OpenBSD: pci_550.c,v 1.17 2007/05/02 21:50:14 martin Exp $ */ /* $NetBSD: pci_550.c,v 1.18 2000/06/29 08:58:48 mrg Exp $ */ /*- @@ -385,7 +385,7 @@ dec_550_pciide_compat_intr_establish(v, dev, pa, chan, func, arg) irq = PCIIDE_COMPAT_IRQ(chan); #if NSIO cookie = sio_intr_establish(NULL /*XXX*/, irq, IST_EDGE, IPL_BIO, - func, arg, "dec 550 irq"); + func, arg, dev->dv_xname); #endif return (cookie); } diff --git a/sys/arch/alpha/pci/pci_6600.c b/sys/arch/alpha/pci/pci_6600.c index 6fd5fd8849a..fc3a4005a54 100644 --- a/sys/arch/alpha/pci/pci_6600.c +++ b/sys/arch/alpha/pci/pci_6600.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_6600.c,v 1.15 2006/06/15 20:08:29 brad Exp $ */ +/* $OpenBSD: pci_6600.c,v 1.16 2007/05/02 21:50:14 martin Exp $ */ /* $NetBSD: pci_6600.c,v 1.5 2000/06/06 00:50:15 thorpej Exp $ */ /*- @@ -344,7 +344,7 @@ dec_6600_pciide_compat_intr_establish(v, dev, pa, chan, func, arg) irq = PCIIDE_COMPAT_IRQ(chan); #if NSIO cookie = sio_intr_establish(NULL /*XXX*/, irq, IST_EDGE, IPL_BIO, - func, arg, "dec 6600 irq"); + func, arg, dev->dv_xname); if (cookie == NULL) return (NULL); diff --git a/sys/arch/alpha/pci/pci_eb164.c b/sys/arch/alpha/pci/pci_eb164.c index 2d1f3345e06..2b9e6b48fa5 100644 --- a/sys/arch/alpha/pci/pci_eb164.c +++ b/sys/arch/alpha/pci/pci_eb164.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_eb164.c,v 1.19 2006/06/15 20:08:29 brad Exp $ */ +/* $OpenBSD: pci_eb164.c,v 1.20 2007/05/02 21:50:14 martin Exp $ */ /* $NetBSD: pci_eb164.c,v 1.27 2000/06/06 00:50:15 thorpej Exp $ */ /*- @@ -338,7 +338,7 @@ dec_eb164_pciide_compat_intr_establish(v, dev, pa, chan, func, arg) irq = PCIIDE_COMPAT_IRQ(chan); #if NSIO cookie = sio_intr_establish(NULL /*XXX*/, irq, IST_EDGE, IPL_BIO, - func, arg, "eb164 irq"); + func, arg, dev->dv_xname); if (cookie == NULL) return (NULL); #endif diff --git a/sys/arch/alpha/pci/pci_up1000.c b/sys/arch/alpha/pci/pci_up1000.c index 35fea1fff73..cc8d15d87fb 100644 --- a/sys/arch/alpha/pci/pci_up1000.c +++ b/sys/arch/alpha/pci/pci_up1000.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_up1000.c,v 1.11 2006/06/15 20:08:29 brad Exp $ */ +/* $OpenBSD: pci_up1000.c,v 1.12 2007/05/02 21:50:14 martin Exp $ */ /* $NetBSD: pci_up1000.c,v 1.6 2000/12/28 22:59:07 sommerfeld Exp $ */ /*- @@ -206,7 +206,7 @@ api_up1000_pciide_compat_intr_establish(void *icv, struct device *dev, irq = PCIIDE_COMPAT_IRQ(chan); #if NSIO cookie = sio_intr_establish(NULL /*XXX*/, irq, IST_EDGE, IPL_BIO, - func, arg, "up 1000 irq"); + func, arg, dev->dv_xname); if (cookie == NULL) return (NULL); #endif |