Module Name: src
Committed By: msaitoh
Date: Wed May 10 02:46:33 UTC 2017
Modified Files:
src/sys/dev/pci: fwohci_pci.c if_sip.c ohci_pci.c pccbb.c
Log Message:
Use pci_intr_establish_xname().
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/pci/fwohci_pci.c
cvs rdiff -u -r1.165 -r1.166 src/sys/dev/pci/if_sip.c
cvs rdiff -u -r1.55 -r1.56 src/sys/dev/pci/ohci_pci.c
cvs rdiff -u -r1.210 -r1.211 src/sys/dev/pci/pccbb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/fwohci_pci.c
diff -u src/sys/dev/pci/fwohci_pci.c:1.43 src/sys/dev/pci/fwohci_pci.c:1.44
--- src/sys/dev/pci/fwohci_pci.c:1.43 Thu Jul 7 06:55:41 2016
+++ src/sys/dev/pci/fwohci_pci.c Wed May 10 02:46:33 2017
@@ -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, devic
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)
Index: src/sys/dev/pci/if_sip.c
diff -u src/sys/dev/pci/if_sip.c:1.165 src/sys/dev/pci/if_sip.c:1.166
--- src/sys/dev/pci/if_sip.c:1.165 Thu Dec 15 09:28:05 2016
+++ src/sys/dev/pci/if_sip.c Wed May 10 02:46:33 2017
@@ -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
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)
Index: src/sys/dev/pci/ohci_pci.c
diff -u src/sys/dev/pci/ohci_pci.c:1.55 src/sys/dev/pci/ohci_pci.c:1.56
--- src/sys/dev/pci/ohci_pci.c:1.55 Sat Apr 23 10:15:31 2016
+++ src/sys/dev/pci/ohci_pci.c Wed May 10 02:46:33 2017
@@ -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_
* 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)
Index: src/sys/dev/pci/pccbb.c
diff -u src/sys/dev/pci/pccbb.c:1.210 src/sys/dev/pci/pccbb.c:1.211
--- src/sys/dev/pci/pccbb.c:1.210 Thu Jul 7 06:55:41 2016
+++ src/sys/dev/pci/pccbb.c Wed May 10 02:46:33 2017
@@ -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");
