Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use pci_intr_establish_xname().

This commit is contained in:
msaitoh 2017-05-10 02:46:33 +00:00
parent da419f9608
commit c4659e5b0a
4 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/pci/fwohci_pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fwohci_pci.c,v 1.43 2016/07/07 06:55:41 msaitoh Exp $ */
/* $NetBSD: fwohci_pci.c,v 1.44 2017/05/10 02:46:33 msaitoh Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: fwohci_pci.c,v 1.43 2016/07/07 06:55:41 msaitoh Exp $");
__KERNEL_RCSID(0, "$NetBSD: fwohci_pci.c,v 1.44 2017/05/10 02:46:33 msaitoh Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@ -139,8 +139,8 @@ fwohci_pci_attach(device_t parent, device_t self, void *aux)
goto fail;
}
intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf));
psc->psc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_BIO, fwohci_intr,
&psc->psc_sc);
psc->psc_ih = pci_intr_establish_xname(pa->pa_pc, ih, IPL_BIO,
fwohci_intr, &psc->psc_sc, device_xname(self));
if (psc->psc_ih == NULL) {
aprint_error_dev(self, "couldn't establish interrupt");
if (intrstr != NULL)

7
sys/dev/pci/if_sip.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_sip.c,v 1.165 2016/12/15 09:28:05 ozaki-r Exp $ */
/* $NetBSD: if_sip.c,v 1.166 2017/05/10 02:46:33 msaitoh Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.165 2016/12/15 09:28:05 ozaki-r Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_sip.c,v 1.166 2017/05/10 02:46:33 msaitoh Exp $");
@ -1102,7 +1102,8 @@ sipcom_attach(device_t parent, device_t self, void *aux)
return;
}
intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
sc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, sipcom_intr, sc);
sc->sc_ih = pci_intr_establish_xname(pc, ih, IPL_NET, sipcom_intr, sc,
device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(sc->sc_dev, "unable to establish interrupt");
if (intrstr != NULL)

7
sys/dev/pci/ohci_pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ohci_pci.c,v 1.55 2016/04/23 10:15:31 skrll Exp $ */
/* $NetBSD: ohci_pci.c,v 1.56 2017/05/10 02:46:33 msaitoh Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ohci_pci.c,v 1.55 2016/04/23 10:15:31 skrll Exp $");
__KERNEL_RCSID(0, "$NetBSD: ohci_pci.c,v 1.56 2017/05/10 02:46:33 msaitoh Exp $");
#include "ehci.h"
@ -141,7 +141,8 @@ ohci_pci_attach(device_t parent, device_t self, void *aux)
* Allocate IRQ
*/
intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
sc->sc_ih = pci_intr_establish(pc, ih, IPL_USB, ohci_intr, sc);
sc->sc_ih = pci_intr_establish_xname(pc, ih, IPL_USB, ohci_intr, sc,
device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "couldn't establish interrupt");
if (intrstr != NULL)

7
sys/dev/pci/pccbb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pccbb.c,v 1.210 2016/07/07 06:55:41 msaitoh Exp $ */
/* $NetBSD: pccbb.c,v 1.211 2017/05/10 02:46:33 msaitoh Exp $ */
/*
* Copyright (c) 1998, 1999 and 2000
@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.210 2016/07/07 06:55:41 msaitoh Exp $");
__KERNEL_RCSID(0, "$NetBSD: pccbb.c,v 1.211 2017/05/10 02:46:33 msaitoh Exp $");
/*
#define CBB_DEBUG
@ -931,7 +931,8 @@ pccbb_intrinit(struct pccbb_softc *sc)
* than any other hard interrupts.
*/
KASSERT(sc->sc_ih == NULL);
sc->sc_ih = pci_intr_establish(pc, ih, IPL_BIO, pccbbintr, sc);
sc->sc_ih = pci_intr_establish_xname(pc, ih, IPL_BIO, pccbbintr, sc,
device_xname(sc->sc_dev));
if (sc->sc_ih == NULL) {
aprint_error_dev(sc->sc_dev, "couldn't establish interrupt");