Module Name: src
Committed By: jdolecek
Date: Sun Dec 9 11:14:02 UTC 2018
Modified Files:
src/sys/dev/pci: aac_pci.c adv_pci.c adw_pci.c ahc_pci.c ahd_pci.c
amr.c arcmsr.c artsata.c atppc_puc.c auacer.c auixp.c auvia.c
azalia.c btvmei.c cac_pci.c ciss_pci.c cmpci.c coram.c cs4280.c
cs4281.c cxdtv.c cy_pci.c cz.c dpt_pci.c eap.c emuxki.c esa.c esm.c
eso.c fms.c gcscaudio.c icp_pci.c if_age.c if_alc.c if_ale.c
if_an_pci.c if_athn_pci.c if_atw_pci.c if_bce.c if_bwfm_pci.c
if_bwi_pci.c if_cas.c if_de.c if_dge.c if_ep_pci.c if_epic_pci.c
if_esh_pci.c if_et.c if_ex_pci.c if_fpa.c if_fxp_pci.c if_gem_pci.c
if_hme_pci.c if_ipw.c if_iwi.c if_jme.c if_kse.c if_le_pci.c
if_lii.c if_lmc.c if_malo_pci.c if_mtd_pci.c if_ne_pci.c if_nfe.c
if_ntwoc_pci.c if_ral_pci.c if_rtk_pci.c if_rtw_pci.c if_rtwn.c
if_sf_pci.c if_ste.c if_stge.c if_ti.c if_tl.c if_tlp_pci.c
if_txp.c if_vge.c if_vr.c if_vte.c if_wi_pci.c if_wpi.c if_xge.c
iha_pci.c iop_pci.c isp_pci.c jmide.c mfi_pci.c mlx_pci.c mly.c
neo.c njs_pci.c oboe.c pcscp.c pdcsata.c rtsx_pci.c satalink.c
siop_pci_common.c sv.c svwsata.c tga.c trm.c twa.c twe.c ubsec.c
universe_pci.c viaide.c voodoofb.c voyager.c yds.c
Log Message:
use pci_intr_establish_xname() everywhere
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/pci/aac_pci.c src/sys/dev/pci/trm.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/pci/adv_pci.c \
src/sys/dev/pci/iop_pci.c src/sys/dev/pci/pdcsata.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/pci/adw_pci.c \
src/sys/dev/pci/artsata.c src/sys/dev/pci/if_alc.c \
src/sys/dev/pci/if_cas.c
cvs rdiff -u -r1.72 -r1.73 src/sys/dev/pci/ahc_pci.c
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/pci/ahd_pci.c \
src/sys/dev/pci/if_hme_pci.c
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/pci/amr.c src/sys/dev/pci/cz.c
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/pci/arcmsr.c \
src/sys/dev/pci/if_ne_pci.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/pci/atppc_puc.c \
src/sys/dev/pci/coram.c src/sys/dev/pci/cxdtv.c \
src/sys/dev/pci/gcscaudio.c src/sys/dev/pci/if_bwi_pci.c
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/pci/auacer.c
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/pci/auixp.c src/sys/dev/pci/fms.c
cvs rdiff -u -r1.79 -r1.80 src/sys/dev/pci/auvia.c
cvs rdiff -u -r1.84 -r1.85 src/sys/dev/pci/azalia.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/pci/btvmei.c \
src/sys/dev/pci/if_ntwoc_pci.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/pci/cac_pci.c \
src/sys/dev/pci/if_an_pci.c src/sys/dev/pci/if_jme.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/pci/ciss_pci.c
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/pci/cmpci.c src/sys/dev/pci/if_txp.c \
src/sys/dev/pci/neo.c
cvs rdiff -u -r1.69 -r1.70 src/sys/dev/pci/cs4280.c src/sys/dev/pci/if_ipw.c
cvs rdiff -u -r1.52 -r1.53 src/sys/dev/pci/cs4281.c \
src/sys/dev/pci/if_le_pci.c src/sys/dev/pci/sv.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/pci/cy_pci.c src/sys/dev/pci/if_ale.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/pci/dpt_pci.c \
src/sys/dev/pci/if_atw_pci.c src/sys/dev/pci/if_xge.c
cvs rdiff -u -r1.97 -r1.98 src/sys/dev/pci/eap.c
cvs rdiff -u -r1.65 -r1.66 src/sys/dev/pci/emuxki.c src/sys/dev/pci/if_nfe.c \
src/sys/dev/pci/if_stge.c src/sys/dev/pci/if_vge.c
cvs rdiff -u -r1.61 -r1.62 src/sys/dev/pci/esa.c src/sys/dev/pci/if_fpa.c
cvs rdiff -u -r1.59 -r1.60 src/sys/dev/pci/esm.c src/sys/dev/pci/yds.c
cvs rdiff -u -r1.67 -r1.68 src/sys/dev/pci/eso.c src/sys/dev/pci/if_lmc.c
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/pci/icp_pci.c \
src/sys/dev/pci/if_rtw_pci.c src/sys/dev/pci/svwsata.c
cvs rdiff -u -r1.53 -r1.54 src/sys/dev/pci/if_age.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/pci/if_athn_pci.c \
src/sys/dev/pci/njs_pci.c src/sys/dev/pci/universe_pci.c \
src/sys/dev/pci/voyager.c
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/pci/if_bce.c \
src/sys/dev/pci/if_gem_pci.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/pci/if_bwfm_pci.c
cvs rdiff -u -r1.155 -r1.156 src/sys/dev/pci/if_de.c
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/pci/if_dge.c
cvs rdiff -u -r1.54 -r1.55 src/sys/dev/pci/if_ep_pci.c
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/pci/if_epic_pci.c
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/pci/if_esh_pci.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/pci/if_et.c src/sys/dev/pci/if_rtwn.c
cvs rdiff -u -r1.57 -r1.58 src/sys/dev/pci/if_ex_pci.c
cvs rdiff -u -r1.82 -r1.83 src/sys/dev/pci/if_fxp_pci.c
cvs rdiff -u -r1.108 -r1.109 src/sys/dev/pci/if_iwi.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/pci/if_kse.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/pci/if_lii.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pci/if_malo_pci.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/pci/if_mtd_pci.c \
src/sys/dev/pci/if_vte.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/pci/if_ral_pci.c
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/pci/if_rtk_pci.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/pci/if_sf_pci.c \
src/sys/dev/pci/jmide.c
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/pci/if_ste.c src/sys/dev/pci/mly.c \
src/sys/dev/pci/voodoofb.c
cvs rdiff -u -r1.105 -r1.106 src/sys/dev/pci/if_ti.c
cvs rdiff -u -r1.109 -r1.110 src/sys/dev/pci/if_tl.c
cvs rdiff -u -r1.124 -r1.125 src/sys/dev/pci/if_tlp_pci.c
cvs rdiff -u -r1.125 -r1.126 src/sys/dev/pci/if_vr.c
cvs rdiff -u -r1.56 -r1.57 src/sys/dev/pci/if_wi_pci.c src/sys/dev/pci/twa.c
cvs rdiff -u -r1.83 -r1.84 src/sys/dev/pci/if_wpi.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/pci/iha_pci.c \
src/sys/dev/pci/mfi_pci.c
cvs rdiff -u -r1.119 -r1.120 src/sys/dev/pci/isp_pci.c
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/pci/mlx_pci.c
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/pci/oboe.c
cvs rdiff -u -r1.48 -r1.49 src/sys/dev/pci/pcscp.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/pci/rtsx_pci.c
cvs rdiff -u -r1.55 -r1.56 src/sys/dev/pci/satalink.c
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/pci/siop_pci_common.c
cvs rdiff -u -r1.85 -r1.86 src/sys/dev/pci/tga.c
cvs rdiff -u -r1.106 -r1.107 src/sys/dev/pci/twe.c
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/pci/ubsec.c
cvs rdiff -u -r1.86 -r1.87 src/sys/dev/pci/viaide.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/aac_pci.c
diff -u src/sys/dev/pci/aac_pci.c:1.39 src/sys/dev/pci/aac_pci.c:1.40
--- src/sys/dev/pci/aac_pci.c:1.39 Mon Oct 15 09:27:30 2018
+++ src/sys/dev/pci/aac_pci.c Sun Dec 9 11:14:01 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: aac_pci.c,v 1.39 2018/10/15 09:27:30 uwe Exp $ */
+/* $NetBSD: aac_pci.c,v 1.40 2018/12/09 11:14:01 jdolecek Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aac_pci.c,v 1.39 2018/10/15 09:27:30 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aac_pci.c,v 1.40 2018/12/09 11:14:01 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -481,8 +481,8 @@ aac_pci_intr_set(struct aac_softc *sc, i
pcisc = (struct aac_pci_softc *) sc;
pci_intr_disestablish(pcisc->sc_pc, sc->sc_ih);
- sc->sc_ih = pci_intr_establish(pcisc->sc_pc, pcisc->sc_ih,
- IPL_BIO, hand, arg);
+ sc->sc_ih = pci_intr_establish_xname(pcisc->sc_pc, pcisc->sc_ih,
+ IPL_BIO, hand, arg, device_xname(sc->sc_dv));
if (sc->sc_ih == NULL) {
return ENXIO;
}
@@ -563,7 +563,8 @@ aac_pci_attach(device_t parent, device_t
goto bail_out;
}
intrstr = pci_intr_string(pc, pcisc->sc_ih, intrbuf, sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish(pc, pcisc->sc_ih, IPL_BIO, aac_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(pc, pcisc->sc_ih, IPL_BIO,
+ aac_intr, sc, device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error("couldn't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/trm.c
diff -u src/sys/dev/pci/trm.c:1.39 src/sys/dev/pci/trm.c:1.40
--- src/sys/dev/pci/trm.c:1.39 Thu Feb 9 20:42:30 2017
+++ src/sys/dev/pci/trm.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: trm.c,v 1.39 2017/02/09 20:42:30 macallan Exp $ */
+/* $NetBSD: trm.c,v 1.40 2018/12/09 11:14:02 jdolecek Exp $ */
/*-
* Copyright (c) 2002 Izumi Tsutsui. All rights reserved.
*
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trm.c,v 1.39 2017/02/09 20:42:30 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trm.c,v 1.40 2018/12/09 11:14:02 jdolecek Exp $");
/* #define TRM_DEBUG */
#ifdef TRM_DEBUG
@@ -477,7 +477,8 @@ trm_attach(device_t parent, device_t sel
}
intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf));
- if (pci_intr_establish(pa->pa_pc, ih, IPL_BIO, trm_intr, sc) == NULL) {
+ if (pci_intr_establish_xname(pa->pa_pc, ih, IPL_BIO, trm_intr, sc,
+ device_xname(self)) == NULL) {
aprint_error_dev(self, "couldn't establish interrupt");
if (intrstr != NULL)
aprint_error(" at %s", intrstr);
Index: src/sys/dev/pci/adv_pci.c
diff -u src/sys/dev/pci/adv_pci.c:1.29 src/sys/dev/pci/adv_pci.c:1.30
--- src/sys/dev/pci/adv_pci.c:1.29 Sat Oct 18 08:33:28 2014
+++ src/sys/dev/pci/adv_pci.c Sun Dec 9 11:14:01 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: adv_pci.c,v 1.29 2014/10/18 08:33:28 snj Exp $ */
+/* $NetBSD: adv_pci.c,v 1.30 2018/12/09 11:14:01 jdolecek Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc. All rights reserved.
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adv_pci.c,v 1.29 2014/10/18 08:33:28 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adv_pci.c,v 1.30 2018/12/09 11:14:01 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -224,7 +224,8 @@ adv_pci_attach(device_t parent, device_t
/*
* Establish Interrupt handler
*/
- sc->sc_ih = pci_intr_establish(pc, ih, IPL_BIO, adv_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(pc, ih, IPL_BIO, adv_intr, sc,
+ device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(sc->sc_dev, "couldn't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/iop_pci.c
diff -u src/sys/dev/pci/iop_pci.c:1.29 src/sys/dev/pci/iop_pci.c:1.30
--- src/sys/dev/pci/iop_pci.c:1.29 Thu Jul 14 04:12:08 2016
+++ src/sys/dev/pci/iop_pci.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: iop_pci.c,v 1.29 2016/07/14 04:12:08 msaitoh Exp $ */
+/* $NetBSD: iop_pci.c,v 1.30 2018/12/09 11:14:02 jdolecek Exp $ */
/*-
* Copyright (c) 2000, 2001, 2002 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iop_pci.c,v 1.29 2016/07/14 04:12:08 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iop_pci.c,v 1.30 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -188,7 +188,8 @@ iop_pci_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_BIO, iop_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(pc, ih, IPL_BIO, iop_intr, sc,
+ device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error("can't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/pdcsata.c
diff -u src/sys/dev/pci/pdcsata.c:1.29 src/sys/dev/pci/pdcsata.c:1.30
--- src/sys/dev/pci/pdcsata.c:1.29 Fri Oct 20 07:06:08 2017
+++ src/sys/dev/pci/pdcsata.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pdcsata.c,v 1.29 2017/10/20 07:06:08 jdolecek Exp $ */
+/* $NetBSD: pdcsata.c,v 1.30 2018/12/09 11:14:02 jdolecek Exp $ */
/*
* Copyright (c) 2004, Manuel Bouyer.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pdcsata.c,v 1.29 2017/10/20 07:06:08 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pdcsata.c,v 1.30 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -239,9 +239,11 @@ pdcsata_chip_map(struct pciide_softc *sc
"couldn't map interrupt\n");
return;
}
- intrstr = pci_intr_string(pa->pa_pc, intrhandle, intrbuf, sizeof(intrbuf));
- sc->sc_pci_ih = pci_intr_establish(pa->pa_pc,
- intrhandle, IPL_BIO, pdcsata_pci_intr, sc);
+ intrstr = pci_intr_string(pa->pa_pc, intrhandle, intrbuf,
+ sizeof(intrbuf));
+ sc->sc_pci_ih = pci_intr_establish_xname(pa->pa_pc,
+ intrhandle, IPL_BIO, pdcsata_pci_intr, sc,
+ device_xname(sc->sc_wdcdev.sc_atac.atac_dev));
if (sc->sc_pci_ih == NULL) {
aprint_error_dev(sc->sc_wdcdev.sc_atac.atac_dev,
Index: src/sys/dev/pci/adw_pci.c
diff -u src/sys/dev/pci/adw_pci.c:1.28 src/sys/dev/pci/adw_pci.c:1.29
--- src/sys/dev/pci/adw_pci.c:1.28 Sat Oct 18 08:33:28 2014
+++ src/sys/dev/pci/adw_pci.c Sun Dec 9 11:14:01 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: adw_pci.c,v 1.28 2014/10/18 08:33:28 snj Exp $ */
+/* $NetBSD: adw_pci.c,v 1.29 2018/12/09 11:14:01 jdolecek Exp $ */
/*
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adw_pci.c,v 1.28 2014/10/18 08:33:28 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adw_pci.c,v 1.29 2018/12/09 11:14:01 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -178,7 +178,8 @@ adw_pci_attach(device_t parent, device_t
/*
* Establish Interrupt handler
*/
- sc->sc_ih = pci_intr_establish(pc, ih, IPL_BIO, adw_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(pc, ih, IPL_BIO, adw_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/artsata.c
diff -u src/sys/dev/pci/artsata.c:1.28 src/sys/dev/pci/artsata.c:1.29
--- src/sys/dev/pci/artsata.c:1.28 Fri Oct 20 07:06:08 2017
+++ src/sys/dev/pci/artsata.c Sun Dec 9 11:14:01 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: artsata.c,v 1.28 2017/10/20 07:06:08 jdolecek Exp $ */
+/* $NetBSD: artsata.c,v 1.29 2018/12/09 11:14:01 jdolecek Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: artsata.c,v 1.28 2017/10/20 07:06:08 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: artsata.c,v 1.29 2018/12/09 11:14:01 jdolecek Exp $");
#include "opt_pciide.h"
@@ -139,8 +139,9 @@ artisea_mapregs(const struct pci_attach_
}
intrstr = pci_intr_string(pa->pa_pc, intrhandle,
intrbuf, sizeof(intrbuf));
- sc->sc_pci_ih = pci_intr_establish(pa->pa_pc,
- intrhandle, IPL_BIO, pci_intr, sc);
+ sc->sc_pci_ih = pci_intr_establish_xname(pa->pa_pc,
+ intrhandle, IPL_BIO, pci_intr, sc,
+ device_xname(sc->sc_wdcdev.sc_atac.atac_dev));
if (sc->sc_pci_ih != NULL) {
aprint_normal_dev(sc->sc_wdcdev.sc_atac.atac_dev,
"using %s for native-PCI interrupt\n", intrstr);
Index: src/sys/dev/pci/if_alc.c
diff -u src/sys/dev/pci/if_alc.c:1.28 src/sys/dev/pci/if_alc.c:1.29
--- src/sys/dev/pci/if_alc.c:1.28 Tue Jun 26 06:48:01 2018
+++ src/sys/dev/pci/if_alc.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_alc.c,v 1.28 2018/06/26 06:48:01 msaitoh Exp $ */
+/* $NetBSD: if_alc.c,v 1.29 2018/12/09 11:14:02 jdolecek Exp $ */
/* $OpenBSD: if_alc.c,v 1.1 2009/08/08 09:31:13 kevlo Exp $ */
/*-
* Copyright (c) 2009, Pyun YongHyeon <[email protected]>
@@ -1208,7 +1208,8 @@ alc_attach(device_t parent, device_t sel
* Allocate IRQ
*/
intrstr = pci_intr_string(sc->sc_pct, ih, intrbuf, sizeof(intrbuf));
- sc->sc_irq_handle = pci_intr_establish(pc, ih, IPL_NET, alc_intr, sc);
+ sc->sc_irq_handle = pci_intr_establish_xname(pc, ih, IPL_NET, alc_intr,
+ sc, device_xname(self));
if (sc->sc_irq_handle == NULL) {
printf(": could not establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/if_cas.c
diff -u src/sys/dev/pci/if_cas.c:1.28 src/sys/dev/pci/if_cas.c:1.29
--- src/sys/dev/pci/if_cas.c:1.28 Thu Nov 15 10:56:29 2018
+++ src/sys/dev/pci/if_cas.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_cas.c,v 1.28 2018/11/15 10:56:29 maxv Exp $ */
+/* $NetBSD: if_cas.c,v 1.29 2018/12/09 11:14:02 jdolecek Exp $ */
/* $OpenBSD: if_cas.c,v 1.29 2009/11/29 16:19:38 kettenis Exp $ */
/*
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cas.c,v 1.28 2018/11/15 10:56:29 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cas.c,v 1.29 2018/12/09 11:14:02 jdolecek Exp $");
#ifndef _MODULE
#include "opt_inet.h"
@@ -1819,8 +1819,8 @@ cas_estintr(struct cas_softc *sc, int wh
/* PCI interrupts */
if (what & CAS_INTR_PCI) {
intrstr = pci_intr_string(sc->sc_pc, sc->sc_handle, intrbuf, sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish(sc->sc_pc, sc->sc_handle,
- IPL_NET, cas_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(sc->sc_pc, sc->sc_handle,
+ IPL_NET, cas_intr, sc, device_xname(sc->sc_dev));
if (sc->sc_ih == NULL) {
aprint_error_dev(sc->sc_dev,
"unable to establish interrupt");
Index: src/sys/dev/pci/ahc_pci.c
diff -u src/sys/dev/pci/ahc_pci.c:1.72 src/sys/dev/pci/ahc_pci.c:1.73
--- src/sys/dev/pci/ahc_pci.c:1.72 Sun Jun 3 10:45:16 2018
+++ src/sys/dev/pci/ahc_pci.c Sun Dec 9 11:14:01 2018
@@ -39,7 +39,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES.
*
- * $Id: ahc_pci.c,v 1.72 2018/06/03 10:45:16 maxv Exp $
+ * $Id: ahc_pci.c,v 1.73 2018/12/09 11:14:01 jdolecek Exp $
*
* //depot/aic7xxx/aic7xxx/aic7xxx_pci.c#57 $
*
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahc_pci.c,v 1.72 2018/06/03 10:45:16 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahc_pci.c,v 1.73 2018/12/09 11:14:01 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -956,7 +956,8 @@ ahc_pci_attach(device_t parent, device_t
return;
}
intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf));
- ahc->ih = pci_intr_establish(pa->pa_pc, ih, IPL_BIO, ahc_intr, ahc);
+ ahc->ih = pci_intr_establish_xname(pa->pa_pc, ih, IPL_BIO, ahc_intr,
+ ahc, device_xname(self));
if (ahc->ih == NULL) {
aprint_error_dev(ahc->sc_dev,
"couldn't establish interrupt\n");
Index: src/sys/dev/pci/ahd_pci.c
diff -u src/sys/dev/pci/ahd_pci.c:1.37 src/sys/dev/pci/ahd_pci.c:1.38
--- src/sys/dev/pci/ahd_pci.c:1.37 Sat Jun 23 06:45:51 2018
+++ src/sys/dev/pci/ahd_pci.c Sun Dec 9 11:14:01 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ahd_pci.c,v 1.37 2018/06/23 06:45:51 maxv Exp $ */
+/* $NetBSD: ahd_pci.c,v 1.38 2018/12/09 11:14:01 jdolecek Exp $ */
/*
* Product specific probe and attach routines for:
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahd_pci.c,v 1.37 2018/06/23 06:45:51 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahd_pci.c,v 1.38 2018/12/09 11:14:01 jdolecek Exp $");
#define AHD_PCI_IOADDR PCI_MAPREG_START /* I/O Address */
#define AHD_PCI_MEMADDR (PCI_MAPREG_START + 4) /* Mem I/O Address */
@@ -537,7 +537,8 @@ ahd_pci_attach(device_t parent, device_t
return;
}
intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf));
- ahd->ih = pci_intr_establish(pa->pa_pc, ih, IPL_BIO, ahd_intr, ahd);
+ ahd->ih = pci_intr_establish_xname(pa->pa_pc, ih, IPL_BIO, ahd_intr,
+ ahd, device_xname(self));
if (ahd->ih == NULL) {
aprint_error("%s: couldn't establish interrupt",
ahd_name(ahd));
Index: src/sys/dev/pci/if_hme_pci.c
diff -u src/sys/dev/pci/if_hme_pci.c:1.37 src/sys/dev/pci/if_hme_pci.c:1.38
--- src/sys/dev/pci/if_hme_pci.c:1.37 Sat Mar 29 19:28:24 2014
+++ src/sys/dev/pci/if_hme_pci.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_hme_pci.c,v 1.37 2014/03/29 19:28:24 christos Exp $ */
+/* $NetBSD: if_hme_pci.c,v 1.38 2018/12/09 11:14:02 jdolecek Exp $ */
/*
* Copyright (c) 2000 Matthew R. Green
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_hme_pci.c,v 1.37 2014/03/29 19:28:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_hme_pci.c,v 1.38 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -306,7 +306,8 @@ got_eaddr:
return;
}
intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf));
- hsc->hsc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_NET, hme_intr, sc);
+ hsc->hsc_ih = pci_intr_establish_xname(pa->pa_pc, ih, IPL_NET, hme_intr,
+ sc, device_xname(self));
if (hsc->hsc_ih == NULL) {
aprint_error_dev(self, "unable to establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/amr.c
diff -u src/sys/dev/pci/amr.c:1.63 src/sys/dev/pci/amr.c:1.64
--- src/sys/dev/pci/amr.c:1.63 Mon Sep 3 16:29:32 2018
+++ src/sys/dev/pci/amr.c Sun Dec 9 11:14:01 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: amr.c,v 1.63 2018/09/03 16:29:32 riastradh Exp $ */
+/* $NetBSD: amr.c,v 1.64 2018/12/09 11:14:01 jdolecek Exp $ */
/*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amr.c,v 1.63 2018/09/03 16:29:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amr.c,v 1.64 2018/12/09 11:14:01 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -341,7 +341,8 @@ amr_attach(device_t parent, device_t sel
return;
}
intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
- amr->amr_ih = pci_intr_establish(pc, ih, IPL_BIO, amr_intr, amr);
+ amr->amr_ih = pci_intr_establish_xname(pc, ih, IPL_BIO, amr_intr, amr,
+ device_xname(self));
if (amr->amr_ih == NULL) {
aprint_error("can't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/cz.c
diff -u src/sys/dev/pci/cz.c:1.63 src/sys/dev/pci/cz.c:1.64
--- src/sys/dev/pci/cz.c:1.63 Mon Sep 3 16:29:32 2018
+++ src/sys/dev/pci/cz.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cz.c,v 1.63 2018/09/03 16:29:32 riastradh Exp $ */
+/* $NetBSD: cz.c,v 1.64 2018/12/09 11:14:02 jdolecek Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cz.c,v 1.63 2018/09/03 16:29:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cz.c,v 1.64 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -344,8 +344,8 @@ cz_attach(device_t parent, device_t self
goto polling_mode;
} else {
intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf));
- cz->cz_ih = pci_intr_establish(pa->pa_pc, ih, IPL_TTY,
- cz_intr, cz);
+ cz->cz_ih = pci_intr_establish_xname(pa->pa_pc, ih, IPL_TTY,
+ cz_intr, cz, device_xname(self));
}
if (cz->cz_ih == NULL) {
aprint_error_dev(cz->cz_dev, "unable to establish interrupt");
Index: src/sys/dev/pci/arcmsr.c
diff -u src/sys/dev/pci/arcmsr.c:1.38 src/sys/dev/pci/arcmsr.c:1.39
--- src/sys/dev/pci/arcmsr.c:1.38 Mon Sep 3 16:29:32 2018
+++ src/sys/dev/pci/arcmsr.c Sun Dec 9 11:14:01 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: arcmsr.c,v 1.38 2018/09/03 16:29:32 riastradh Exp $ */
+/* $NetBSD: arcmsr.c,v 1.39 2018/12/09 11:14:01 jdolecek Exp $ */
/* $OpenBSD: arc.c,v 1.68 2007/10/27 03:28:27 dlg Exp $ */
/*
@@ -21,7 +21,7 @@
#include "bio.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arcmsr.c,v 1.38 2018/09/03 16:29:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arcmsr.c,v 1.39 2018/12/09 11:14:01 jdolecek Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -628,8 +628,8 @@ arc_map_pci_resources(device_t self, str
pci_intr_setattr(pa->pa_pc, &ih, PCI_INTR_MPSAFE, true);
- sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_BIO,
- arc_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(pa->pa_pc, ih, IPL_BIO,
+ arc_intr, sc, device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error(": unable to map interrupt [2]\n");
goto unmap;
Index: src/sys/dev/pci/if_ne_pci.c
diff -u src/sys/dev/pci/if_ne_pci.c:1.38 src/sys/dev/pci/if_ne_pci.c:1.39
--- src/sys/dev/pci/if_ne_pci.c:1.38 Sun Jul 15 05:16:45 2018
+++ src/sys/dev/pci/if_ne_pci.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ne_pci.c,v 1.38 2018/07/15 05:16:45 maxv Exp $ */
+/* $NetBSD: if_ne_pci.c,v 1.39 2018/12/09 11:14:02 jdolecek Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ne_pci.c,v 1.38 2018/07/15 05:16:45 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ne_pci.c,v 1.39 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -237,7 +237,8 @@ ne_pci_attach(device_t parent, device_t
return;
}
intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
- psc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, dp8390_intr, dsc);
+ psc->sc_ih = pci_intr_establish_xname(pc, ih, IPL_NET, dp8390_intr,
+ dsc, device_xname(self));
if (psc->sc_ih == NULL) {
aprint_error_dev(dsc->sc_dev, "couldn't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/atppc_puc.c
diff -u src/sys/dev/pci/atppc_puc.c:1.15 src/sys/dev/pci/atppc_puc.c:1.16
--- src/sys/dev/pci/atppc_puc.c:1.15 Fri Nov 30 16:26:59 2018
+++ src/sys/dev/pci/atppc_puc.c Sun Dec 9 11:14:01 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: atppc_puc.c,v 1.15 2018/11/30 16:26:59 jmcneill Exp $ */
+/* $NetBSD: atppc_puc.c,v 1.16 2018/12/09 11:14:01 jdolecek Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include "opt_atppc.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atppc_puc.c,v 1.15 2018/11/30 16:26:59 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atppc_puc.c,v 1.16 2018/12/09 11:14:01 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -117,8 +117,8 @@ atppc_puc_attach(device_t parent, device
intrstr = pci_intr_string(aa->pc, aa->intrhandle, intrbuf,
sizeof(intrbuf));
- sc->sc_ieh = pci_intr_establish(aa->pc, aa->intrhandle, IPL_TTY,
- atppcintr, sc);
+ sc->sc_ieh = pci_intr_establish_xname(aa->pc, aa->intrhandle, IPL_TTY,
+ atppcintr, sc, device_xname(self));
if (sc->sc_ieh == NULL) {
aprint_error_dev(sc->sc_dev, "couldn't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/coram.c
diff -u src/sys/dev/pci/coram.c:1.15 src/sys/dev/pci/coram.c:1.16
--- src/sys/dev/pci/coram.c:1.15 Wed Jun 6 01:49:08 2018
+++ src/sys/dev/pci/coram.c Sun Dec 9 11:14:01 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: coram.c,v 1.15 2018/06/06 01:49:08 maya Exp $ */
+/* $NetBSD: coram.c,v 1.16 2018/12/09 11:14:01 jdolecek Exp $ */
/*
* Copyright (c) 2008, 2011 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: coram.c,v 1.15 2018/06/06 01:49:08 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coram.c,v 1.16 2018/12/09 11:14:01 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -194,7 +194,8 @@ coram_attach(device_t parent, device_t s
return;
}
intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_VM, coram_intr, self);
+ sc->sc_ih = pci_intr_establish_xname(pa->pa_pc, ih, IPL_VM, coram_intr,
+ self, device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "couldn't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/cxdtv.c
diff -u src/sys/dev/pci/cxdtv.c:1.15 src/sys/dev/pci/cxdtv.c:1.16
--- src/sys/dev/pci/cxdtv.c:1.15 Thu Jun 1 02:45:11 2017
+++ src/sys/dev/pci/cxdtv.c Sun Dec 9 11:14:01 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cxdtv.c,v 1.15 2017/06/01 02:45:11 chs Exp $ */
+/* $NetBSD: cxdtv.c,v 1.16 2018/12/09 11:14:01 jdolecek Exp $ */
/*
* Copyright (c) 2008, 2011 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cxdtv.c,v 1.15 2017/06/01 02:45:11 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cxdtv.c,v 1.16 2018/12/09 11:14:01 jdolecek Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -217,7 +217,8 @@ cxdtv_attach(device_t parent, device_t s
return;
}
intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_VM, cxdtv_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(pa->pa_pc, ih, IPL_VM, cxdtv_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/gcscaudio.c
diff -u src/sys/dev/pci/gcscaudio.c:1.15 src/sys/dev/pci/gcscaudio.c:1.16
--- src/sys/dev/pci/gcscaudio.c:1.15 Thu Jun 1 02:45:11 2017
+++ src/sys/dev/pci/gcscaudio.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: gcscaudio.c,v 1.15 2017/06/01 02:45:11 chs Exp $ */
+/* $NetBSD: gcscaudio.c,v 1.16 2018/12/09 11:14:02 jdolecek Exp $ */
/*-
* Copyright (c) 2008 SHIMIZU Ryo <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gcscaudio.c,v 1.15 2017/06/01 02:45:11 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gcscaudio.c,v 1.16 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -294,8 +294,8 @@ gcscaudio_attach(device_t parent, device
}
intrstr = pci_intr_string(sc->sc_pc, ih, intrbuf, sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish(sc->sc_pc, ih, IPL_AUDIO,
- gcscaudio_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(sc->sc_pc, ih, IPL_AUDIO,
+ gcscaudio_intr, sc, device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(sc->sc_dev, "couldn't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/if_bwi_pci.c
diff -u src/sys/dev/pci/if_bwi_pci.c:1.15 src/sys/dev/pci/if_bwi_pci.c:1.16
--- src/sys/dev/pci/if_bwi_pci.c:1.15 Thu Jul 7 06:55:41 2016
+++ src/sys/dev/pci/if_bwi_pci.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bwi_pci.c,v 1.15 2016/07/07 06:55:41 msaitoh Exp $ */
+/* $NetBSD: if_bwi_pci.c,v 1.16 2018/12/09 11:14:02 jdolecek Exp $ */
/* $OpenBSD: if_bwi_pci.c,v 1.6 2008/02/14 22:10:02 brad Exp $ */
/*
@@ -24,7 +24,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bwi_pci.c,v 1.15 2016/07/07 06:55:41 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bwi_pci.c,v 1.16 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/callout.h>
@@ -146,7 +146,8 @@ bwi_pci_attach(device_t parent, device_t
/* establish interrupt */
intrstr = pci_intr_string(psc->psc_pc, ih, intrbuf, sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish(psc->psc_pc, ih, IPL_NET, bwi_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(psc->psc_pc, ih, IPL_NET, bwi_intr,
+ sc, device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "could not establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/auacer.c
diff -u src/sys/dev/pci/auacer.c:1.34 src/sys/dev/pci/auacer.c:1.35
--- src/sys/dev/pci/auacer.c:1.34 Sat Jun 23 06:45:51 2018
+++ src/sys/dev/pci/auacer.c Sun Dec 9 11:14:01 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: auacer.c,v 1.34 2018/06/23 06:45:51 maxv Exp $ */
+/* $NetBSD: auacer.c,v 1.35 2018/12/09 11:14:01 jdolecek Exp $ */
/*-
* Copyright (c) 2004, 2008 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auacer.c,v 1.34 2018/06/23 06:45:51 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auacer.c,v 1.35 2018/12/09 11:14:01 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -293,8 +293,8 @@ auacer_attach(device_t parent, device_t
return;
}
intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_AUDIO,
- auacer_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(pa->pa_pc, ih, IPL_AUDIO,
+ auacer_intr, sc, device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(sc->sc_dev, "can't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/auixp.c
diff -u src/sys/dev/pci/auixp.c:1.43 src/sys/dev/pci/auixp.c:1.44
--- src/sys/dev/pci/auixp.c:1.43 Thu Jun 1 02:45:11 2017
+++ src/sys/dev/pci/auixp.c Sun Dec 9 11:14:01 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: auixp.c,v 1.43 2017/06/01 02:45:11 chs Exp $ */
+/* $NetBSD: auixp.c,v 1.44 2018/12/09 11:14:01 jdolecek Exp $ */
/*
* Copyright (c) 2004, 2005 Reinoud Zandijk <[email protected]>
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auixp.c,v 1.43 2017/06/01 02:45:11 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auixp.c,v 1.44 2018/12/09 11:14:01 jdolecek Exp $");
#include <sys/types.h>
#include <sys/errno.h>
@@ -1165,7 +1165,8 @@ auixp_attach(device_t parent, device_t s
mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
/* establish interrupt routine hookup at IPL_AUDIO level */
- sc->sc_ih = pci_intr_establish(pc, ih, IPL_AUDIO, auixp_intr, self);
+ sc->sc_ih = pci_intr_establish_xname(pc, ih, IPL_AUDIO, auixp_intr,
+ self, device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(sc->sc_dev, "can't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/fms.c
diff -u src/sys/dev/pci/fms.c:1.43 src/sys/dev/pci/fms.c:1.44
--- src/sys/dev/pci/fms.c:1.43 Thu Jun 1 02:45:11 2017
+++ src/sys/dev/pci/fms.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: fms.c,v 1.43 2017/06/01 02:45:11 chs Exp $ */
+/* $NetBSD: fms.c,v 1.44 2018/12/09 11:14:02 jdolecek Exp $ */
/*-
* Copyright (c) 1999, 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fms.c,v 1.43 2017/06/01 02:45:11 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fms.c,v 1.44 2018/12/09 11:14:02 jdolecek Exp $");
#include "mpu.h"
@@ -264,7 +264,8 @@ fms_attach(device_t parent, device_t sel
mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
- sc->sc_ih = pci_intr_establish(pc, ih, IPL_AUDIO, fms_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(pc, ih, IPL_AUDIO, fms_intr, sc,
+ device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(sc->sc_dev, "couldn't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/auvia.c
diff -u src/sys/dev/pci/auvia.c:1.79 src/sys/dev/pci/auvia.c:1.80
--- src/sys/dev/pci/auvia.c:1.79 Mon Sep 3 16:29:32 2018
+++ src/sys/dev/pci/auvia.c Sun Dec 9 11:14:01 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: auvia.c,v 1.79 2018/09/03 16:29:32 riastradh Exp $ */
+/* $NetBSD: auvia.c,v 1.80 2018/12/09 11:14:01 jdolecek Exp $ */
/*-
* Copyright (c) 2000, 2008 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auvia.c,v 1.79 2018/09/03 16:29:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auvia.c,v 1.80 2018/12/09 11:14:01 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -429,7 +429,8 @@ auvia_attach(device_t parent, device_t s
mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
- sc->sc_ih = pci_intr_establish(pc, ih, IPL_AUDIO, auvia_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(pc, ih, IPL_AUDIO, auvia_intr, sc,
+ device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(sc->sc_dev, "couldn't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/azalia.c
diff -u src/sys/dev/pci/azalia.c:1.84 src/sys/dev/pci/azalia.c:1.85
--- src/sys/dev/pci/azalia.c:1.84 Thu Jun 1 02:45:11 2017
+++ src/sys/dev/pci/azalia.c Sun Dec 9 11:14:01 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: azalia.c,v 1.84 2017/06/01 02:45:11 chs Exp $ */
+/* $NetBSD: azalia.c,v 1.85 2018/12/09 11:14:01 jdolecek Exp $ */
/*-
* Copyright (c) 2005, 2008 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: azalia.c,v 1.84 2017/06/01 02:45:11 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: azalia.c,v 1.85 2018/12/09 11:14:01 jdolecek Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -337,7 +337,8 @@ azalia_pci_attach(device_t parent, devic
sc->pc = pa->pa_pc;
sc->tag = pa->pa_tag;
intrrupt_str = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf));
- sc->ih = pci_intr_establish(pa->pa_pc, ih, IPL_AUDIO, azalia_intr, sc);
+ sc->ih = pci_intr_establish_xname(pa->pa_pc, ih, IPL_AUDIO, azalia_intr,
+ sc, device_xname(self));
if (sc->ih == NULL) {
aprint_error_dev(self, "can't establish interrupt");
if (intrrupt_str != NULL)
Index: src/sys/dev/pci/btvmei.c
diff -u src/sys/dev/pci/btvmei.c:1.30 src/sys/dev/pci/btvmei.c:1.31
--- src/sys/dev/pci/btvmei.c:1.30 Sat Mar 29 19:28:24 2014
+++ src/sys/dev/pci/btvmei.c Sun Dec 9 11:14:01 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: btvmei.c,v 1.30 2014/03/29 19:28:24 christos Exp $ */
+/* $NetBSD: btvmei.c,v 1.31 2018/12/09 11:14:01 jdolecek Exp $ */
/*
* Copyright (c) 1999
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btvmei.c,v 1.30 2014/03/29 19:28:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btvmei.c,v 1.31 2018/12/09 11:14:01 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -141,7 +141,8 @@ b3_617_attach(device_t parent, device_t
* Use a low interrupt level (the lowest?).
* We will raise before calling a subdevice's handler.
*/
- sc->sc_ih = pci_intr_establish(pc, ih, IPL_BIO, b3_617_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(pc, ih, IPL_BIO, b3_617_intr, sc,
+ device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(sc->sc_dev, "couldn't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/if_ntwoc_pci.c
diff -u src/sys/dev/pci/if_ntwoc_pci.c:1.30 src/sys/dev/pci/if_ntwoc_pci.c:1.31
--- src/sys/dev/pci/if_ntwoc_pci.c:1.30 Thu Jul 14 10:19:06 2016
+++ src/sys/dev/pci/if_ntwoc_pci.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ntwoc_pci.c,v 1.30 2016/07/14 10:19:06 msaitoh Exp $ */
+/* $NetBSD: if_ntwoc_pci.c,v 1.31 2018/12/09 11:14:02 jdolecek Exp $ */
/*
* Copyright (c) 1998 Vixie Enterprises
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ntwoc_pci.c,v 1.30 2016/07/14 10:19:06 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ntwoc_pci.c,v 1.31 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -237,8 +237,8 @@ ntwoc_pci_attach(device_t parent, device
return;
}
intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_NET, ntwoc_pci_intr,
- sc);
+ sc->sc_ih = pci_intr_establish_xname(pa->pa_pc, ih, IPL_NET,
+ ntwoc_pci_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/cac_pci.c
diff -u src/sys/dev/pci/cac_pci.c:1.35 src/sys/dev/pci/cac_pci.c:1.36
--- src/sys/dev/pci/cac_pci.c:1.35 Tue Sep 27 03:33:32 2016
+++ src/sys/dev/pci/cac_pci.c Sun Dec 9 11:14:01 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cac_pci.c,v 1.35 2016/09/27 03:33:32 pgoyette Exp $ */
+/* $NetBSD: cac_pci.c,v 1.36 2018/12/09 11:14:01 jdolecek Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cac_pci.c,v 1.35 2016/09/27 03:33:32 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cac_pci.c,v 1.36 2018/12/09 11:14:01 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -207,7 +207,8 @@ cac_pci_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_BIO, cac_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(pc, ih, IPL_BIO, cac_intr, sc,
+ device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error("can't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/if_an_pci.c
diff -u src/sys/dev/pci/if_an_pci.c:1.35 src/sys/dev/pci/if_an_pci.c:1.36
--- src/sys/dev/pci/if_an_pci.c:1.35 Sat Mar 29 19:28:24 2014
+++ src/sys/dev/pci/if_an_pci.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_an_pci.c,v 1.35 2014/03/29 19:28:24 christos Exp $ */
+/* $NetBSD: if_an_pci.c,v 1.36 2018/12/09 11:14:02 jdolecek Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_an_pci.c,v 1.35 2014/03/29 19:28:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_an_pci.c,v 1.36 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -149,7 +149,8 @@ an_pci_attach(device_t parent, device_t
return;
}
intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf));
- psc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_NET, an_intr, sc);
+ psc->sc_ih = pci_intr_establish_xname(pa->pa_pc, ih, IPL_NET, an_intr,
+ sc, device_xname(self));
if (psc->sc_ih == NULL) {
aprint_error_dev(self, "unable to establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/if_jme.c
diff -u src/sys/dev/pci/if_jme.c:1.35 src/sys/dev/pci/if_jme.c:1.36
--- src/sys/dev/pci/if_jme.c:1.35 Tue Jun 26 06:48:01 2018
+++ src/sys/dev/pci/if_jme.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_jme.c,v 1.35 2018/06/26 06:48:01 msaitoh Exp $ */
+/* $NetBSD: if_jme.c,v 1.36 2018/12/09 11:14:02 jdolecek Exp $ */
/*
* Copyright (c) 2008 Manuel Bouyer. All rights reserved.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1.35 2018/06/26 06:48:01 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_jme.c,v 1.36 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
@@ -393,8 +393,8 @@ jme_pci_attach(device_t parent, device_t
}
intrstr = pci_intr_string(pa->pa_pc, intrhandle, intrbuf, sizeof(intrbuf));
sc->jme_if.if_softc = sc;
- sc->jme_ih = pci_intr_establish(pa->pa_pc, intrhandle, IPL_NET,
- jme_intr, sc);
+ sc->jme_ih = pci_intr_establish_xname(pa->pa_pc, intrhandle, IPL_NET,
+ jme_intr, sc, device_xname(self));
if (sc->jme_ih == NULL) {
aprint_error_dev(self, "couldn't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/ciss_pci.c
diff -u src/sys/dev/pci/ciss_pci.c:1.14 src/sys/dev/pci/ciss_pci.c:1.15
--- src/sys/dev/pci/ciss_pci.c:1.14 Mon Feb 12 23:11:00 2018
+++ src/sys/dev/pci/ciss_pci.c Sun Dec 9 11:14:01 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ciss_pci.c,v 1.14 2018/02/12 23:11:00 joerg Exp $ */
+/* $NetBSD: ciss_pci.c,v 1.15 2018/12/09 11:14:01 jdolecek Exp $ */
/* $OpenBSD: ciss_pci.c,v 1.9 2005/12/13 15:56:01 brad Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ciss_pci.c,v 1.14 2018/02/12 23:11:00 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ciss_pci.c,v 1.15 2018/12/09 11:14:01 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -347,7 +347,8 @@ ciss_pci_attach(device_t parent, device_
return;
}
intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_BIO, ciss_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(pa->pa_pc, ih, IPL_BIO, ciss_intr,
+ sc, device_xname(self));
if (!sc->sc_ih) {
aprint_error_dev(sc->sc_dev, "can't establish interrupt");
if (intrstr)
Index: src/sys/dev/pci/cmpci.c
diff -u src/sys/dev/pci/cmpci.c:1.50 src/sys/dev/pci/cmpci.c:1.51
--- src/sys/dev/pci/cmpci.c:1.50 Thu Jun 1 02:45:11 2017
+++ src/sys/dev/pci/cmpci.c Sun Dec 9 11:14:01 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cmpci.c,v 1.50 2017/06/01 02:45:11 chs Exp $ */
+/* $NetBSD: cmpci.c,v 1.51 2018/12/09 11:14:01 jdolecek Exp $ */
/*
* Copyright (c) 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cmpci.c,v 1.50 2017/06/01 02:45:11 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cmpci.c,v 1.51 2018/12/09 11:14:01 jdolecek Exp $");
#if defined(AUDIO_DEBUG) || defined(DEBUG)
#define DPRINTF(x) if (cmpcidebug) printf x
@@ -420,8 +420,8 @@ cmpci_attach(device_t parent, device_t s
return;
}
strintr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_AUDIO, cmpci_intr,
- sc);
+ sc->sc_ih = pci_intr_establish_xname(pa->pa_pc, ih, IPL_AUDIO,
+ cmpci_intr, sc, device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(sc->sc_dev, "failed to establish interrupt");
if (strintr != NULL)
Index: src/sys/dev/pci/if_txp.c
diff -u src/sys/dev/pci/if_txp.c:1.50 src/sys/dev/pci/if_txp.c:1.51
--- src/sys/dev/pci/if_txp.c:1.50 Wed Jul 25 07:55:44 2018
+++ src/sys/dev/pci/if_txp.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_txp.c,v 1.50 2018/07/25 07:55:44 msaitoh Exp $ */
+/* $NetBSD: if_txp.c,v 1.51 2018/12/09 11:14:02 jdolecek Exp $ */
/*
* Copyright (c) 2001
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_txp.c,v 1.50 2018/07/25 07:55:44 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_txp.c,v 1.51 2018/12/09 11:14:02 jdolecek Exp $");
#include "opt_inet.h"
@@ -251,7 +251,8 @@ txp_attach(device_t parent, device_t sel
}
intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, txp_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(pc, ih, IPL_NET, txp_intr, sc,
+ device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error(": couldn't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/neo.c
diff -u src/sys/dev/pci/neo.c:1.50 src/sys/dev/pci/neo.c:1.51
--- src/sys/dev/pci/neo.c:1.50 Sat Mar 29 19:28:25 2014
+++ src/sys/dev/pci/neo.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: neo.c,v 1.50 2014/03/29 19:28:25 christos Exp $ */
+/* $NetBSD: neo.c,v 1.51 2018/12/09 11:14:02 jdolecek Exp $ */
/*
* Copyright (c) 1999 Cameron Grant <[email protected]>
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: neo.c,v 1.50 2014/03/29 19:28:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: neo.c,v 1.51 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -610,7 +610,8 @@ neo_attach(device_t parent, device_t sel
mutex_init(&sc->intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
- sc->ih = pci_intr_establish(pc, ih, IPL_AUDIO, neo_intr, sc);
+ sc->ih = pci_intr_establish_xname(pc, ih, IPL_AUDIO, neo_intr, sc,
+ device_xname(self));
if (sc->ih == NULL) {
aprint_error_dev(self, "couldn't establish interrupt");
Index: src/sys/dev/pci/cs4280.c
diff -u src/sys/dev/pci/cs4280.c:1.69 src/sys/dev/pci/cs4280.c:1.70
--- src/sys/dev/pci/cs4280.c:1.69 Thu Jul 7 06:55:41 2016
+++ src/sys/dev/pci/cs4280.c Sun Dec 9 11:14:01 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cs4280.c,v 1.69 2016/07/07 06:55:41 msaitoh Exp $ */
+/* $NetBSD: cs4280.c,v 1.70 2018/12/09 11:14:01 jdolecek Exp $ */
/*
* Copyright (c) 1999, 2000 Tatoku Ogaito. All rights reserved.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs4280.c,v 1.69 2016/07/07 06:55:41 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs4280.c,v 1.70 2018/12/09 11:14:01 jdolecek Exp $");
#include "midi.h"
@@ -319,8 +319,8 @@ cs4280_attach(device_t parent, device_t
mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
- sc->sc_ih = pci_intr_establish(sc->sc_pc, sc->intrh, IPL_AUDIO,
- cs4280_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(sc->sc_pc, sc->intrh, IPL_AUDIO,
+ cs4280_intr, sc, device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(sc->sc_dev, "couldn't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/if_ipw.c
diff -u src/sys/dev/pci/if_ipw.c:1.69 src/sys/dev/pci/if_ipw.c:1.70
--- src/sys/dev/pci/if_ipw.c:1.69 Tue Jun 26 06:48:01 2018
+++ src/sys/dev/pci/if_ipw.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ipw.c,v 1.69 2018/06/26 06:48:01 msaitoh Exp $ */
+/* $NetBSD: if_ipw.c,v 1.70 2018/12/09 11:14:02 jdolecek Exp $ */
/* FreeBSD: src/sys/dev/ipw/if_ipw.c,v 1.15 2005/11/13 17:17:40 damien Exp */
/*-
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ipw.c,v 1.69 2018/06/26 06:48:01 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ipw.c,v 1.70 2018/12/09 11:14:02 jdolecek Exp $");
/*-
* Intel(R) PRO/Wireless 2100 MiniPCI driver
@@ -221,7 +221,8 @@ ipw_attach(device_t parent, device_t sel
}
intrstr = pci_intr_string(sc->sc_pct, ih, intrbuf, sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish(sc->sc_pct, ih, IPL_NET, ipw_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(sc->sc_pct, ih, IPL_NET, ipw_intr,
+ sc, device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(sc->sc_dev, "could not establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/cs4281.c
diff -u src/sys/dev/pci/cs4281.c:1.52 src/sys/dev/pci/cs4281.c:1.53
--- src/sys/dev/pci/cs4281.c:1.52 Thu Jul 7 06:55:41 2016
+++ src/sys/dev/pci/cs4281.c Sun Dec 9 11:14:01 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cs4281.c,v 1.52 2016/07/07 06:55:41 msaitoh Exp $ */
+/* $NetBSD: cs4281.c,v 1.53 2018/12/09 11:14:01 jdolecek Exp $ */
/*
* Copyright (c) 2000 Tatoku Ogaito. All rights reserved.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cs4281.c,v 1.52 2016/07/07 06:55:41 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs4281.c,v 1.53 2018/12/09 11:14:01 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -250,8 +250,8 @@ cs4281_attach(device_t parent, device_t
mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
- sc->sc_ih = pci_intr_establish(sc->sc_pc, sc->intrh, IPL_AUDIO,
- cs4281_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(sc->sc_pc, sc->intrh, IPL_AUDIO,
+ cs4281_intr, sc, device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(sc->sc_dev, "couldn't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/if_le_pci.c
diff -u src/sys/dev/pci/if_le_pci.c:1.52 src/sys/dev/pci/if_le_pci.c:1.53
--- src/sys/dev/pci/if_le_pci.c:1.52 Sat Mar 29 19:28:24 2014
+++ src/sys/dev/pci/if_le_pci.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_pci.c,v 1.52 2014/03/29 19:28:24 christos Exp $ */
+/* $NetBSD: if_le_pci.c,v 1.53 2018/12/09 11:14:02 jdolecek Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_pci.c,v 1.52 2014/03/29 19:28:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_pci.c,v 1.53 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -337,7 +337,8 @@ le_pci_attach(device_t parent, device_t
return;
}
intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
- lesc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, am79900_intr, sc);
+ lesc->sc_ih = pci_intr_establish_xname(pc, ih, IPL_NET, am79900_intr,
+ sc, device_xname(self));
if (lesc->sc_ih == NULL) {
aprint_error_dev(self, "couldn't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/sv.c
diff -u src/sys/dev/pci/sv.c:1.52 src/sys/dev/pci/sv.c:1.53
--- src/sys/dev/pci/sv.c:1.52 Thu Jun 1 02:45:11 2017
+++ src/sys/dev/pci/sv.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sv.c,v 1.52 2017/06/01 02:45:11 chs Exp $ */
+/* $NetBSD: sv.c,v 1.53 2018/12/09 11:14:02 jdolecek Exp $ */
/* $OpenBSD: sv.c,v 1.2 1998/07/13 01:50:15 csapuntz Exp $ */
/*
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sv.c,v 1.52 2017/06/01 02:45:11 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sv.c,v 1.53 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -429,7 +429,8 @@ sv_attach(device_t parent, device_t self
mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish(pc, ih, IPL_AUDIO, sv_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(pc, ih, IPL_AUDIO, sv_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/cy_pci.c
diff -u src/sys/dev/pci/cy_pci.c:1.25 src/sys/dev/pci/cy_pci.c:1.26
--- src/sys/dev/pci/cy_pci.c:1.25 Thu Jul 7 06:55:41 2016
+++ src/sys/dev/pci/cy_pci.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cy_pci.c,v 1.25 2016/07/07 06:55:41 msaitoh Exp $ */
+/* $NetBSD: cy_pci.c,v 1.26 2018/12/09 11:14:02 jdolecek Exp $ */
/*
* cy_pci.c
@@ -10,7 +10,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cy_pci.c,v 1.25 2016/07/07 06:55:41 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cy_pci.c,v 1.26 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -137,7 +137,8 @@ cy_pci_attach(device_t parent, device_t
return;
}
intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_TTY, cy_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(pa->pa_pc, ih, IPL_TTY, cy_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/if_ale.c
diff -u src/sys/dev/pci/if_ale.c:1.25 src/sys/dev/pci/if_ale.c:1.26
--- src/sys/dev/pci/if_ale.c:1.25 Thu Nov 15 10:56:29 2018
+++ src/sys/dev/pci/if_ale.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ale.c,v 1.25 2018/11/15 10:56:29 maxv Exp $ */
+/* $NetBSD: if_ale.c,v 1.26 2018/12/09 11:14:02 jdolecek Exp $ */
/*-
* Copyright (c) 2008, Pyun YongHyeon <[email protected]>
@@ -32,7 +32,7 @@
/* Driver for Atheros AR8121/AR8113/AR8114 PCIe Ethernet. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ale.c,v 1.25 2018/11/15 10:56:29 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ale.c,v 1.26 2018/12/09 11:14:02 jdolecek Exp $");
#include "vlan.h"
@@ -426,7 +426,8 @@ ale_attach(device_t parent, device_t sel
* Allocate IRQ
*/
intrstr = pci_intr_string(sc->sc_pct, ih, intrbuf, sizeof(intrbuf));
- sc->sc_irq_handle = pci_intr_establish(pc, ih, IPL_NET, ale_intr, sc);
+ sc->sc_irq_handle = pci_intr_establish_xname(pc, ih, IPL_NET, ale_intr,
+ sc, device_xname(self));
if (sc->sc_irq_handle == NULL) {
aprint_error_dev(self, "could not establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/dpt_pci.c
diff -u src/sys/dev/pci/dpt_pci.c:1.27 src/sys/dev/pci/dpt_pci.c:1.28
--- src/sys/dev/pci/dpt_pci.c:1.27 Sat Mar 29 19:28:24 2014
+++ src/sys/dev/pci/dpt_pci.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: dpt_pci.c,v 1.27 2014/03/29 19:28:24 christos Exp $ */
+/* $NetBSD: dpt_pci.c,v 1.28 2018/12/09 11:14:02 jdolecek Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Andrew Doran <[email protected]>
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dpt_pci.c,v 1.27 2014/03/29 19:28:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dpt_pci.c,v 1.28 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -121,7 +121,8 @@ dpt_pci_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_BIO, dpt_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(pc, ih, IPL_BIO, dpt_intr, sc,
+ device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error("can't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/if_atw_pci.c
diff -u src/sys/dev/pci/if_atw_pci.c:1.27 src/sys/dev/pci/if_atw_pci.c:1.28
--- src/sys/dev/pci/if_atw_pci.c:1.27 Thu Jul 14 04:00:46 2016
+++ src/sys/dev/pci/if_atw_pci.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_atw_pci.c,v 1.27 2016/07/14 04:00:46 msaitoh Exp $ */
+/* $NetBSD: if_atw_pci.c,v 1.28 2018/12/09 11:14:02 jdolecek Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_atw_pci.c,v 1.27 2016/07/14 04:00:46 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_atw_pci.c,v 1.28 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -139,9 +139,9 @@ atw_pci_resume(device_t self, const pmf_
struct atw_pci_softc *psc = device_private(self);
struct atw_softc *sc = &psc->psc_atw;
- /* Establish the interrupt. */
- psc->psc_intrcookie = pci_intr_establish(psc->psc_pc, psc->psc_ih,
- IPL_NET, atw_intr, sc);
+ /* XXX re-establishing interrupt shouldn't be needed */
+ psc->psc_intrcookie = pci_intr_establish_xname(psc->psc_pc, psc->psc_ih,
+ IPL_NET, atw_intr, sc, device_xname(self));
if (psc->psc_intrcookie == NULL) {
aprint_error_dev(sc->sc_dev, "unable to establish interrupt\n");
return false;
@@ -257,8 +257,8 @@ atw_pci_attach(device_t parent, device_t
return;
}
intrstr = pci_intr_string(pc, psc->psc_ih, intrbuf, sizeof(intrbuf));
- psc->psc_intrcookie = pci_intr_establish(pc, psc->psc_ih, IPL_NET,
- atw_intr, sc);
+ psc->psc_intrcookie = pci_intr_establish_xname(pc, psc->psc_ih, IPL_NET,
+ atw_intr, sc, device_xname(self));
if (psc->psc_intrcookie == NULL) {
aprint_error_dev(self, "unable to establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/if_xge.c
diff -u src/sys/dev/pci/if_xge.c:1.27 src/sys/dev/pci/if_xge.c:1.28
--- src/sys/dev/pci/if_xge.c:1.27 Mon Sep 3 16:29:32 2018
+++ src/sys/dev/pci/if_xge.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xge.c,v 1.27 2018/09/03 16:29:32 riastradh Exp $ */
+/* $NetBSD: if_xge.c,v 1.28 2018/12/09 11:14:02 jdolecek Exp $ */
/*
* Copyright (c) 2004, SUNET, Swedish University Computer Network.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_xge.c,v 1.27 2018/09/03 16:29:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xge.c,v 1.28 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
@@ -564,8 +564,9 @@ xge_attach(device_t parent, device_t sel
return;
}
intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
- if ((sc->sc_ih =
- pci_intr_establish(pc, ih, IPL_NET, xge_intr, sc)) == NULL) {
+ sc->sc_ih = pci_intr_establish_xname(pc, ih, IPL_NET, xge_intr, sc,
+ device_xname(self));
+ if (sc->sc_ih == NULL) {
aprint_error_dev(sc->sc_dev,
"unable to establish interrupt at %s\n",
intrstr ? intrstr : "<unknown>");
Index: src/sys/dev/pci/eap.c
diff -u src/sys/dev/pci/eap.c:1.97 src/sys/dev/pci/eap.c:1.98
--- src/sys/dev/pci/eap.c:1.97 Thu Jun 1 02:45:11 2017
+++ src/sys/dev/pci/eap.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: eap.c,v 1.97 2017/06/01 02:45:11 chs Exp $ */
+/* $NetBSD: eap.c,v 1.98 2018/12/09 11:14:02 jdolecek Exp $ */
/* $OpenBSD: eap.c,v 1.6 1999/10/05 19:24:42 csapuntz Exp $ */
/*
@@ -51,7 +51,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eap.c,v 1.97 2017/06/01 02:45:11 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eap.c,v 1.98 2018/12/09 11:14:02 jdolecek Exp $");
#include "midi.h"
#include "joy_eap.h"
@@ -601,7 +601,8 @@ eap_attach(device_t parent, device_t sel
return;
}
intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish(pc, ih, IPL_AUDIO, eap_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(pc, ih, IPL_AUDIO, eap_intr, sc,
+ device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(sc->sc_dev, "couldn't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/emuxki.c
diff -u src/sys/dev/pci/emuxki.c:1.65 src/sys/dev/pci/emuxki.c:1.66
--- src/sys/dev/pci/emuxki.c:1.65 Thu Jun 1 02:45:11 2017
+++ src/sys/dev/pci/emuxki.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: emuxki.c,v 1.65 2017/06/01 02:45:11 chs Exp $ */
+/* $NetBSD: emuxki.c,v 1.66 2018/12/09 11:14:02 jdolecek Exp $ */
/*-
* Copyright (c) 2001, 2007 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: emuxki.c,v 1.65 2017/06/01 02:45:11 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emuxki.c,v 1.66 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -434,8 +434,8 @@ emuxki_attach(device_t parent, device_t
}
intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_AUDIO, emuxki_intr,
- sc);
+ sc->sc_ih = pci_intr_establish_xname(pa->pa_pc, ih, IPL_AUDIO,
+ emuxki_intr, sc, device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "couldn't establish interrupt");
if (intrstr != NULL)
@@ -446,7 +446,7 @@ emuxki_attach(device_t parent, device_t
}
aprint_normal_dev(self, "interrupting at %s\n", intrstr);
- /* XXX it's unknown whether APS is made from Audigy as well */
+ /* XXX it's unknown whether APS is made from Audigy as well */
if (PCI_PRODUCT(pa->pa_id) == PCI_PRODUCT_CREATIVELABS_AUDIGY) {
sc->sc_type = EMUXKI_AUDIGY;
if (PCI_REVISION(pa->pa_class) == 0x04) {
Index: src/sys/dev/pci/if_nfe.c
diff -u src/sys/dev/pci/if_nfe.c:1.65 src/sys/dev/pci/if_nfe.c:1.66
--- src/sys/dev/pci/if_nfe.c:1.65 Tue Jun 26 06:48:01 2018
+++ src/sys/dev/pci/if_nfe.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_nfe.c,v 1.65 2018/06/26 06:48:01 msaitoh Exp $ */
+/* $NetBSD: if_nfe.c,v 1.66 2018/12/09 11:14:02 jdolecek Exp $ */
/* $OpenBSD: if_nfe.c,v 1.77 2008/02/05 16:52:50 brad Exp $ */
/*-
@@ -21,7 +21,7 @@
/* Driver for NVIDIA nForce MCP Fast Ethernet and Gigabit Ethernet */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_nfe.c,v 1.65 2018/06/26 06:48:01 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_nfe.c,v 1.66 2018/12/09 11:14:02 jdolecek Exp $");
#include "opt_inet.h"
#include "vlan.h"
@@ -246,7 +246,8 @@ nfe_attach(device_t parent, device_t sel
}
intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, nfe_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(pc, ih, IPL_NET, nfe_intr, sc,
+ device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "could not establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/if_stge.c
diff -u src/sys/dev/pci/if_stge.c:1.65 src/sys/dev/pci/if_stge.c:1.66
--- src/sys/dev/pci/if_stge.c:1.65 Tue Jun 26 06:48:01 2018
+++ src/sys/dev/pci/if_stge.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_stge.c,v 1.65 2018/06/26 06:48:01 msaitoh Exp $ */
+/* $NetBSD: if_stge.c,v 1.66 2018/12/09 11:14:02 jdolecek Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_stge.c,v 1.65 2018/06/26 06:48:01 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_stge.c,v 1.66 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
@@ -442,7 +442,8 @@ stge_attach(device_t parent, device_t se
return;
}
intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, stge_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(pc, ih, IPL_NET, stge_intr, sc,
+ device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "unable to establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/if_vge.c
diff -u src/sys/dev/pci/if_vge.c:1.65 src/sys/dev/pci/if_vge.c:1.66
--- src/sys/dev/pci/if_vge.c:1.65 Mon Sep 3 16:29:32 2018
+++ src/sys/dev/pci/if_vge.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vge.c,v 1.65 2018/09/03 16:29:32 riastradh Exp $ */
+/* $NetBSD: if_vge.c,v 1.66 2018/12/09 11:14:02 jdolecek Exp $ */
/*-
* Copyright (c) 2004
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vge.c,v 1.65 2018/09/03 16:29:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vge.c,v 1.66 2018/12/09 11:14:02 jdolecek Exp $");
/*
* VIA Networking Technologies VT612x PCI gigabit ethernet NIC driver.
@@ -911,7 +911,8 @@ vge_attach(device_t parent, device_t sel
return;
}
intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
- sc->sc_intrhand = pci_intr_establish(pc, ih, IPL_NET, vge_intr, sc);
+ sc->sc_intrhand = pci_intr_establish_xname(pc, ih, IPL_NET, vge_intr,
+ sc, device_xname(self));
if (sc->sc_intrhand == NULL) {
aprint_error_dev(self, "unable to establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/esa.c
diff -u src/sys/dev/pci/esa.c:1.61 src/sys/dev/pci/esa.c:1.62
--- src/sys/dev/pci/esa.c:1.61 Thu Jun 1 02:45:11 2017
+++ src/sys/dev/pci/esa.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: esa.c,v 1.61 2017/06/01 02:45:11 chs Exp $ */
+/* $NetBSD: esa.c,v 1.62 2018/12/09 11:14:02 jdolecek Exp $ */
/*
* Copyright (c) 2001-2008 Jared D. McNeill <[email protected]>
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esa.c,v 1.61 2017/06/01 02:45:11 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esa.c,v 1.62 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/types.h>
#include <sys/errno.h>
@@ -1056,7 +1056,8 @@ esa_attach(device_t parent, device_t sel
return;
}
intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish(pc, ih, IPL_AUDIO, esa_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(pc, ih, IPL_AUDIO, esa_intr, sc,
+ device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(sc->sc_dev, "can't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/if_fpa.c
diff -u src/sys/dev/pci/if_fpa.c:1.61 src/sys/dev/pci/if_fpa.c:1.62
--- src/sys/dev/pci/if_fpa.c:1.61 Fri Jun 22 04:17:42 2018
+++ src/sys/dev/pci/if_fpa.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fpa.c,v 1.61 2018/06/22 04:17:42 msaitoh Exp $ */
+/* $NetBSD: if_fpa.c,v 1.62 2018/12/09 11:14:02 jdolecek Exp $ */
/*-
* Copyright (c) 1995, 1996 Matt Thomas <[email protected]>
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fpa.c,v 1.61 2018/06/22 04:17:42 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fpa.c,v 1.62 2018/12/09 11:14:02 jdolecek Exp $");
#ifdef __NetBSD__
#include "opt_inet.h"
@@ -472,7 +472,8 @@ pdq_pci_attach(device_t const parent, de
return;
}
intrstr = pci_intr_string(pa->pa_pc, intrhandle, intrbuf, sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish(pa->pa_pc, intrhandle, IPL_NET, pdq_pci_ifintr, sc);
+ sc->sc_ih = pci_intr_establish_xname(pa->pa_pc, intrhandle, IPL_NET,
+ pdq_pci_ifintr, 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/esm.c
diff -u src/sys/dev/pci/esm.c:1.59 src/sys/dev/pci/esm.c:1.60
--- src/sys/dev/pci/esm.c:1.59 Thu Jul 7 06:55:41 2016
+++ src/sys/dev/pci/esm.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: esm.c,v 1.59 2016/07/07 06:55:41 msaitoh Exp $ */
+/* $NetBSD: esm.c,v 1.60 2018/12/09 11:14:02 jdolecek Exp $ */
/*-
* Copyright (c) 2002, 2003 Matt Fredette
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esm.c,v 1.59 2016/07/07 06:55:41 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esm.c,v 1.60 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1629,7 +1629,8 @@ esm_attach(device_t parent, device_t sel
return;
}
intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
- ess->ih = pci_intr_establish(pc, ih, IPL_AUDIO, esm_intr, self);
+ ess->ih = pci_intr_establish_xname(pc, ih, IPL_AUDIO, esm_intr, self,
+ device_xname(self));
if (ess->ih == NULL) {
aprint_error_dev(ess->sc_dev, "can't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/yds.c
diff -u src/sys/dev/pci/yds.c:1.59 src/sys/dev/pci/yds.c:1.60
--- src/sys/dev/pci/yds.c:1.59 Sun Jun 25 16:07:48 2017
+++ src/sys/dev/pci/yds.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: yds.c,v 1.59 2017/06/25 16:07:48 christos Exp $ */
+/* $NetBSD: yds.c,v 1.60 2018/12/09 11:14:02 jdolecek Exp $ */
/*
* Copyright (c) 2000, 2001 Kazuki Sakamoto and Minoura Makoto.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: yds.c,v 1.59 2017/06/25 16:07:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: yds.c,v 1.60 2018/12/09 11:14:02 jdolecek Exp $");
#include "mpu.h"
@@ -775,7 +775,8 @@ yds_attach(device_t parent, device_t sel
mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish(pc, ih, IPL_AUDIO, yds_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(pc, ih, IPL_AUDIO, yds_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/eso.c
diff -u src/sys/dev/pci/eso.c:1.67 src/sys/dev/pci/eso.c:1.68
--- src/sys/dev/pci/eso.c:1.67 Thu Jun 1 02:45:11 2017
+++ src/sys/dev/pci/eso.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: eso.c,v 1.67 2017/06/01 02:45:11 chs Exp $ */
+/* $NetBSD: eso.c,v 1.68 2018/12/09 11:14:02 jdolecek Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.67 2017/06/01 02:45:11 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.68 2018/12/09 11:14:02 jdolecek Exp $");
#include "mpu.h"
@@ -392,7 +392,8 @@ eso_attach(device_t parent, device_t sel
}
intrstring = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_AUDIO, eso_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(pa->pa_pc, ih, IPL_AUDIO,
+ eso_intr, sc, device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(sc->sc_dev, "couldn't establish interrupt");
if (intrstring != NULL)
Index: src/sys/dev/pci/if_lmc.c
diff -u src/sys/dev/pci/if_lmc.c:1.67 src/sys/dev/pci/if_lmc.c:1.68
--- src/sys/dev/pci/if_lmc.c:1.67 Mon Sep 3 16:29:32 2018
+++ src/sys/dev/pci/if_lmc.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_lmc.c,v 1.67 2018/09/03 16:29:32 riastradh Exp $ */
+/* $NetBSD: if_lmc.c,v 1.68 2018/12/09 11:14:02 jdolecek Exp $ */
/*-
* Copyright (c) 2002-2006 David Boggs. <[email protected]>
@@ -74,7 +74,7 @@
*/
# include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_lmc.c,v 1.67 2018/09/03 16:29:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_lmc.c,v 1.68 2018/12/09 11:14:02 jdolecek Exp $");
# include <sys/param.h> /* OS version */
# include "opt_inet.h" /* INET6, INET */
# include "opt_altq_enabled.h" /* ALTQ */
@@ -5477,10 +5477,10 @@ nbsd_attach(device_t parent, device_t se
nbsd_detach(self, 0);
return;
}
- if ((sc->irq_cookie = pci_intr_establish(pa->pa_pc, sc->intr_handle,
- IPL_NET, bsd_interrupt, sc)) == NULL)
+ if ((sc->irq_cookie = pci_intr_establish_xname(pa->pa_pc, sc->intr_handle,
+ IPL_NET, bsd_interrupt, sc, device_xname(self))) == NULL)
{
- aprint_error("%s: pci_intr_establish() failed\n", NAME_UNIT);
+ aprint_error("%s: couldn't map interrupt\n", NAME_UNIT);
nbsd_detach(self, 0);
return;
}
Index: src/sys/dev/pci/icp_pci.c
diff -u src/sys/dev/pci/icp_pci.c:1.23 src/sys/dev/pci/icp_pci.c:1.24
--- src/sys/dev/pci/icp_pci.c:1.23 Tue Sep 27 03:33:32 2016
+++ src/sys/dev/pci/icp_pci.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: icp_pci.c,v 1.23 2016/09/27 03:33:32 pgoyette Exp $ */
+/* $NetBSD: icp_pci.c,v 1.24 2018/12/09 11:14:02 jdolecek Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icp_pci.c,v 1.23 2016/09/27 03:33:32 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icp_pci.c,v 1.24 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -550,7 +550,8 @@ icp_pci_attach(device_t parent, device_t
goto bail_out;
}
intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf));
- icp->icp_ih = pci_intr_establish(pa->pa_pc, ih, IPL_BIO, icp_intr, icp);
+ icp->icp_ih = pci_intr_establish_xname(pa->pa_pc, ih, IPL_BIO, icp_intr,
+ icp, device_xname(self));
if (icp->icp_ih == NULL) {
aprint_error("couldn't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/if_rtw_pci.c
diff -u src/sys/dev/pci/if_rtw_pci.c:1.23 src/sys/dev/pci/if_rtw_pci.c:1.24
--- src/sys/dev/pci/if_rtw_pci.c:1.23 Sat Mar 29 19:28:25 2014
+++ src/sys/dev/pci/if_rtw_pci.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rtw_pci.c,v 1.23 2014/03/29 19:28:25 christos Exp $ */
+/* $NetBSD: if_rtw_pci.c,v 1.24 2018/12/09 11:14:02 jdolecek Exp $ */
/*-
* Copyright (c) 2004, 2005, 2010 David Young. All rights reserved.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rtw_pci.c,v 1.23 2014/03/29 19:28:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rtw_pci.c,v 1.24 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -248,8 +248,8 @@ rtw_pci_attach(device_t parent, device_t
return;
}
intrstr = pci_intr_string(psc->psc_pc, psc->psc_pih, intrbuf, sizeof(intrbuf));
- psc->psc_ih = pci_intr_establish(psc->psc_pc, psc->psc_pih, IPL_NET,
- rtw_intr, sc);
+ psc->psc_ih = pci_intr_establish_xname(psc->psc_pc, psc->psc_pih,
+ IPL_NET, rtw_intr, sc, device_xname(self));
if (psc->psc_ih == NULL) {
aprint_error_dev(self, "unable to establish interrupt");
if (intrstr != NULL)
@@ -298,9 +298,9 @@ rtw_pci_resume(device_t self, const pmf_
struct rtw_pci_softc *psc = device_private(self);
struct rtw_softc *sc = &psc->psc_rtw;
- /* Establish the interrupt. */
- psc->psc_ih = pci_intr_establish(psc->psc_pc, psc->psc_pih, IPL_NET,
- rtw_intr, sc);
+ /* XXX re-establishing interrupt shouldn't be needed */
+ psc->psc_ih = pci_intr_establish_xname(psc->psc_pc, psc->psc_pih,
+ IPL_NET, rtw_intr, sc, device_xname(self));
if (psc->psc_ih == NULL) {
aprint_error_dev(sc->sc_dev, "unable to establish interrupt\n");
return false;
Index: src/sys/dev/pci/svwsata.c
diff -u src/sys/dev/pci/svwsata.c:1.23 src/sys/dev/pci/svwsata.c:1.24
--- src/sys/dev/pci/svwsata.c:1.23 Wed Jun 6 20:05:36 2018
+++ src/sys/dev/pci/svwsata.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: svwsata.c,v 1.23 2018/06/06 20:05:36 kamil Exp $ */
+/* $NetBSD: svwsata.c,v 1.24 2018/12/09 11:14:02 jdolecek Exp $ */
/*
* Copyright (c) 2005 Mark Kettenis
@@ -17,7 +17,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svwsata.c,v 1.23 2018/06/06 20:05:36 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svwsata.c,v 1.24 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -161,8 +161,8 @@ svwsata_chip_map(struct pciide_softc *sc
return;
}
intrstr = pci_intr_string(pa->pa_pc, intrhandle, intrbuf, sizeof(intrbuf));
- sc->sc_pci_ih = pci_intr_establish(pa->pa_pc, intrhandle, IPL_BIO,
- svwsata_intr, sc);
+ sc->sc_pci_ih = pci_intr_establish_xname(pa->pa_pc, intrhandle, IPL_BIO,
+ svwsata_intr, sc, device_xname(sc->sc_wdcdev.sc_atac.atac_dev));
if (sc->sc_pci_ih != NULL) {
aprint_normal_dev(sc->sc_wdcdev.sc_atac.atac_dev,
"using %s for native-PCI interrupt\n",
Index: src/sys/dev/pci/if_age.c
diff -u src/sys/dev/pci/if_age.c:1.53 src/sys/dev/pci/if_age.c:1.54
--- src/sys/dev/pci/if_age.c:1.53 Tue Jun 26 06:48:01 2018
+++ src/sys/dev/pci/if_age.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_age.c,v 1.53 2018/06/26 06:48:01 msaitoh Exp $ */
+/* $NetBSD: if_age.c,v 1.54 2018/12/09 11:14:02 jdolecek Exp $ */
/* $OpenBSD: if_age.c,v 1.1 2009/01/16 05:00:34 kevlo Exp $ */
/*-
@@ -31,7 +31,7 @@
/* Driver for Attansic Technology Corp. L1 Gigabit Ethernet. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.53 2018/06/26 06:48:01 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.54 2018/12/09 11:14:02 jdolecek Exp $");
#include "vlan.h"
@@ -185,8 +185,8 @@ age_attach(device_t parent, device_t sel
* Allocate IRQ
*/
intrstr = pci_intr_string(sc->sc_pct, ih, intrbuf, sizeof(intrbuf));
- sc->sc_irq_handle = pci_intr_establish(sc->sc_pct, ih, IPL_NET,
- age_intr, sc);
+ sc->sc_irq_handle = pci_intr_establish_xname(sc->sc_pct, ih, IPL_NET,
+ age_intr, sc, device_xname(self));
if (sc->sc_irq_handle == NULL) {
aprint_error_dev(self, "could not establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/if_athn_pci.c
diff -u src/sys/dev/pci/if_athn_pci.c:1.12 src/sys/dev/pci/if_athn_pci.c:1.13
--- src/sys/dev/pci/if_athn_pci.c:1.12 Tue Nov 24 18:17:37 2015
+++ src/sys/dev/pci/if_athn_pci.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_athn_pci.c,v 1.12 2015/11/24 18:17:37 jakllsch Exp $ */
+/* $NetBSD: if_athn_pci.c,v 1.13 2018/12/09 11:14:02 jdolecek Exp $ */
/* $OpenBSD: if_athn_pci.c,v 1.11 2011/01/08 10:02:32 damien Exp $ */
/*-
@@ -22,7 +22,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_athn_pci.c,v 1.12 2015/11/24 18:17:37 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_athn_pci.c,v 1.13 2018/12/09 11:14:02 jdolecek Exp $");
#include "opt_inet.h"
@@ -206,8 +206,8 @@ athn_pci_attach(device_t parent, device_
}
intrstr = pci_intr_string(psc->psc_pc, psc->psc_pih, intrbuf, sizeof(intrbuf));
- psc->psc_ih = pci_intr_establish(psc->psc_pc, psc->psc_pih, IPL_NET,
- athn_intr, sc);
+ psc->psc_ih = pci_intr_establish_xname(psc->psc_pc, psc->psc_pih,
+ IPL_NET, athn_intr, sc, device_xname(self));
if (psc->psc_ih == NULL) {
aprint_error_dev(self, "couldn't map interrupt\n");
goto fail1;
@@ -299,8 +299,9 @@ athn_pci_resume(device_t self, const pmf
if (reg & 0xff00)
pci_conf_write(psc->psc_pc, psc->psc_tag, 0x40, reg & ~0xff00);
- psc->psc_ih = pci_intr_establish(psc->psc_pc, psc->psc_pih, IPL_NET,
- athn_intr, sc);
+ /* XXX re-establishing interrupt shouldn't be needed */
+ psc->psc_ih = pci_intr_establish_xname(psc->psc_pc, psc->psc_pih,
+ IPL_NET, athn_intr, sc, device_xname(self));
if (psc->psc_ih == NULL) {
aprint_error_dev(self, "couldn't map interrupt\n");
return false;
Index: src/sys/dev/pci/njs_pci.c
diff -u src/sys/dev/pci/njs_pci.c:1.12 src/sys/dev/pci/njs_pci.c:1.13
--- src/sys/dev/pci/njs_pci.c:1.12 Thu Jul 14 10:19:06 2016
+++ src/sys/dev/pci/njs_pci.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: njs_pci.c,v 1.12 2016/07/14 10:19:06 msaitoh Exp $ */
+/* $NetBSD: njs_pci.c,v 1.13 2018/12/09 11:14:02 jdolecek Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: njs_pci.c,v 1.12 2016/07/14 10:19:06 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: njs_pci.c,v 1.13 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -192,8 +192,9 @@ njs_pci_attach(device_t parent, device_t
str_at = str_intr = "";
/* setup interrupt handler */
- if ((sc->sc_ih = pci_intr_establish(pc, ih, IPL_BIO, njsc32_intr, sc))
- == NULL) {
+ sc->sc_ih = pci_intr_establish_xname(pc, ih, IPL_BIO, njsc32_intr, sc,
+ device_xname(self));
+ if (sc->sc_ih == NULL) {
aprint_error_dev(self, "unable to establish interrupt%s%s\n",
str_at, str_intr);
return;
Index: src/sys/dev/pci/universe_pci.c
diff -u src/sys/dev/pci/universe_pci.c:1.12 src/sys/dev/pci/universe_pci.c:1.13
--- src/sys/dev/pci/universe_pci.c:1.12 Sat Mar 29 19:28:25 2014
+++ src/sys/dev/pci/universe_pci.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: universe_pci.c,v 1.12 2014/03/29 19:28:25 christos Exp $ */
+/* $NetBSD: universe_pci.c,v 1.13 2018/12/09 11:14:02 jdolecek Exp $ */
/*
* Copyright (c) 1999
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: universe_pci.c,v 1.12 2014/03/29 19:28:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: universe_pci.c,v 1.13 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -146,7 +146,8 @@ univ_pci_attach(struct univ_pci_data *d,
* Use a low interrupt level (the lowest?).
* We will raise before calling a subdevice's handler.
*/
- d->ih = pci_intr_establish(pc, ih, IPL_BIO, univ_pci_intr, d);
+ d->ih = pci_intr_establish_xname(pc, ih, IPL_BIO, univ_pci_intr, d,
+ name);
if (d->ih == NULL) {
aprint_error("%s: couldn't establish interrupt", name);
if (intrstr != NULL)
Index: src/sys/dev/pci/voyager.c
diff -u src/sys/dev/pci/voyager.c:1.12 src/sys/dev/pci/voyager.c:1.13
--- src/sys/dev/pci/voyager.c:1.12 Wed Nov 16 22:05:19 2016
+++ src/sys/dev/pci/voyager.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: voyager.c,v 1.12 2016/11/16 22:05:19 macallan Exp $ */
+/* $NetBSD: voyager.c,v 1.13 2018/12/09 11:14:02 jdolecek Exp $ */
/*
* Copyright (c) 2009, 2011 Michael Lorenz
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: voyager.c,v 1.12 2016/11/16 22:05:19 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: voyager.c,v 1.13 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -199,8 +199,9 @@ voyager_attach(device_t parent, device_t
}
intrstr = pci_intr_string(sc->sc_pc, ih, intrbuf, sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish(sc->sc_pc, ih, IPL_VM,
- voyager_intr, NULL); /* so we get the clock frame instead */
+ sc->sc_ih = pci_intr_establish_xname(sc->sc_pc, ih, IPL_VM,
+ voyager_intr, NULL, /* so we get the clock frame instead */
+ device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "couldn't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/if_bce.c
diff -u src/sys/dev/pci/if_bce.c:1.47 src/sys/dev/pci/if_bce.c:1.48
--- src/sys/dev/pci/if_bce.c:1.47 Tue Jun 26 06:48:01 2018
+++ src/sys/dev/pci/if_bce.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bce.c,v 1.47 2018/06/26 06:48:01 msaitoh Exp $ */
+/* $NetBSD: if_bce.c,v 1.48 2018/12/09 11:14:02 jdolecek Exp $ */
/*
* Copyright (c) 2003 Clifford Wright. All rights reserved.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bce.c,v 1.47 2018/06/26 06:48:01 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bce.c,v 1.48 2018/12/09 11:14:02 jdolecek Exp $");
#include "vlan.h"
@@ -326,7 +326,8 @@ bce_attach(device_t parent, device_t sel
}
intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
- sc->bce_intrhand = pci_intr_establish(pc, ih, IPL_NET, bce_intr, sc);
+ sc->bce_intrhand = pci_intr_establish_xname(pc, ih, IPL_NET, bce_intr,
+ sc, device_xname(self));
if (sc->bce_intrhand == NULL) {
aprint_error_dev(self, "couldn't establish interrupt\n");
Index: src/sys/dev/pci/if_gem_pci.c
diff -u src/sys/dev/pci/if_gem_pci.c:1.47 src/sys/dev/pci/if_gem_pci.c:1.48
--- src/sys/dev/pci/if_gem_pci.c:1.47 Sat Mar 29 19:28:24 2014
+++ src/sys/dev/pci/if_gem_pci.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gem_pci.c,v 1.47 2014/03/29 19:28:24 christos Exp $ */
+/* $NetBSD: if_gem_pci.c,v 1.48 2018/12/09 11:14:02 jdolecek Exp $ */
/*
*
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gem_pci.c,v 1.47 2014/03/29 19:28:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gem_pci.c,v 1.48 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -389,8 +389,8 @@ gem_pci_estintr(struct gem_pci_softc *gs
char intrbuf[PCI_INTRSTR_LEN];
intrstr = pci_intr_string(gsc->gsc_pc, gsc->gsc_handle, intrbuf, sizeof(intrbuf));
- gsc->gsc_ih = pci_intr_establish(gsc->gsc_pc, gsc->gsc_handle, IPL_NET,
- gem_intr, sc);
+ gsc->gsc_ih = pci_intr_establish_xname(gsc->gsc_pc, gsc->gsc_handle,
+ IPL_NET, gem_intr, sc, device_xname(sc->sc_dev));
if (gsc->gsc_ih == NULL) {
aprint_error_dev(sc->sc_dev, "unable to establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/if_bwfm_pci.c
diff -u src/sys/dev/pci/if_bwfm_pci.c:1.5 src/sys/dev/pci/if_bwfm_pci.c:1.6
--- src/sys/dev/pci/if_bwfm_pci.c:1.5 Thu Nov 1 13:09:35 2018
+++ src/sys/dev/pci/if_bwfm_pci.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bwfm_pci.c,v 1.5 2018/11/01 13:09:35 martin Exp $ */
+/* $NetBSD: if_bwfm_pci.c,v 1.6 2018/12/09 11:14:02 jdolecek Exp $ */
/* $OpenBSD: if_bwfm_pci.c,v 1.18 2018/02/08 05:00:38 patrick Exp $ */
/*
* Copyright (c) 2010-2016 Broadcom Corporation
@@ -400,8 +400,8 @@ bwfm_pci_attach(device_t parent, device_
}
intrstr = pci_intr_string(pa->pa_pc, sc->sc_pihp[0], intrbuf, sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish(pa->pa_pc, sc->sc_pihp[0], IPL_NET,
- bwfm_pci_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(pa->pa_pc, sc->sc_pihp[0], IPL_NET,
+ bwfm_pci_intr, sc, device_xname(self));
if (sc->sc_ih == NULL) {
printf(": couldn't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/if_de.c
diff -u src/sys/dev/pci/if_de.c:1.155 src/sys/dev/pci/if_de.c:1.156
--- src/sys/dev/pci/if_de.c:1.155 Mon Sep 3 16:29:32 2018
+++ src/sys/dev/pci/if_de.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_de.c,v 1.155 2018/09/03 16:29:32 riastradh Exp $ */
+/* $NetBSD: if_de.c,v 1.156 2018/12/09 11:14:02 jdolecek Exp $ */
/*-
* Copyright (c) 1994-1997 Matt Thomas ([email protected])
@@ -37,7 +37,7 @@
* board which support 21040, 21041, or 21140 (mostly).
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.155 2018/09/03 16:29:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.156 2018/12/09 11:14:02 jdolecek Exp $");
#define TULIP_HDR_DATA
@@ -5869,8 +5869,8 @@ tulip_pci_attach(
return;
}
intrstr = pci_intr_string(pa->pa_pc, intrhandle, intrbuf, sizeof(intrbuf));
- sc->tulip_ih = pci_intr_establish(pa->pa_pc, intrhandle, IPL_NET,
- intr_rtn, sc);
+ sc->tulip_ih = pci_intr_establish_xname(pa->pa_pc, intrhandle,
+ IPL_NET, intr_rtn, sc, device_xname(self));
if (sc->tulip_ih == NULL) {
aprint_error_dev(sc->tulip_dev, "couldn't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/if_dge.c
diff -u src/sys/dev/pci/if_dge.c:1.49 src/sys/dev/pci/if_dge.c:1.50
--- src/sys/dev/pci/if_dge.c:1.49 Mon Sep 3 16:29:32 2018
+++ src/sys/dev/pci/if_dge.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_dge.c,v 1.49 2018/09/03 16:29:32 riastradh Exp $ */
+/* $NetBSD: if_dge.c,v 1.50 2018/12/09 11:14:02 jdolecek Exp $ */
/*
* Copyright (c) 2004, SUNET, Swedish University Computer Network.
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_dge.c,v 1.49 2018/09/03 16:29:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_dge.c,v 1.50 2018/12/09 11:14:02 jdolecek Exp $");
@@ -744,7 +744,8 @@ dge_attach(device_t parent, device_t sel
return;
}
intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, dge_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(pc, ih, IPL_NET, dge_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/if_ep_pci.c
diff -u src/sys/dev/pci/if_ep_pci.c:1.54 src/sys/dev/pci/if_ep_pci.c:1.55
--- src/sys/dev/pci/if_ep_pci.c:1.54 Sat Jun 23 06:57:24 2018
+++ src/sys/dev/pci/if_ep_pci.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ep_pci.c,v 1.54 2018/06/23 06:57:24 maxv Exp $ */
+/* $NetBSD: if_ep_pci.c,v 1.55 2018/12/09 11:14:02 jdolecek Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ep_pci.c,v 1.54 2018/06/23 06:57:24 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ep_pci.c,v 1.55 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -218,7 +218,8 @@ ep_pci_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, epintr, sc);
+ sc->sc_ih = pci_intr_establish_xname(pc, ih, IPL_NET, epintr, sc,
+ device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(sc->sc_dev, "couldn't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/if_epic_pci.c
diff -u src/sys/dev/pci/if_epic_pci.c:1.41 src/sys/dev/pci/if_epic_pci.c:1.42
--- src/sys/dev/pci/if_epic_pci.c:1.41 Sat Mar 29 19:28:24 2014
+++ src/sys/dev/pci/if_epic_pci.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_epic_pci.c,v 1.41 2014/03/29 19:28:24 christos Exp $ */
+/* $NetBSD: if_epic_pci.c,v 1.42 2018/12/09 11:14:02 jdolecek Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_epic_pci.c,v 1.41 2014/03/29 19:28:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_epic_pci.c,v 1.42 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -219,7 +219,8 @@ epic_pci_attach(device_t parent, device_
return;
}
intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
- psc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, epic_intr, sc);
+ psc->sc_ih = pci_intr_establish_xname(pc, ih, IPL_NET, epic_intr, sc,
+ device_xname(self));
if (psc->sc_ih == NULL) {
aprint_error_dev(self, "unable to establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/if_esh_pci.c
diff -u src/sys/dev/pci/if_esh_pci.c:1.32 src/sys/dev/pci/if_esh_pci.c:1.33
--- src/sys/dev/pci/if_esh_pci.c:1.32 Thu Jul 7 06:55:41 2016
+++ src/sys/dev/pci/if_esh_pci.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_esh_pci.c,v 1.32 2016/07/07 06:55:41 msaitoh Exp $ */
+/* $NetBSD: if_esh_pci.c,v 1.33 2018/12/09 11:14:02 jdolecek Exp $ */
/*
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_esh_pci.c,v 1.32 2016/07/07 06:55:41 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_esh_pci.c,v 1.33 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -153,7 +153,8 @@ esh_pci_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, eshintr, sc);
+ sc->sc_ih = pci_intr_establish_xname(pc, ih, IPL_NET, eshintr, sc,
+ device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(sc->sc_dev, "couldn't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/if_et.c
diff -u src/sys/dev/pci/if_et.c:1.17 src/sys/dev/pci/if_et.c:1.18
--- src/sys/dev/pci/if_et.c:1.17 Tue Jun 26 06:48:01 2018
+++ src/sys/dev/pci/if_et.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_et.c,v 1.17 2018/06/26 06:48:01 msaitoh Exp $ */
+/* $NetBSD: if_et.c,v 1.18 2018/12/09 11:14:02 jdolecek Exp $ */
/* $OpenBSD: if_et.c,v 1.11 2008/06/08 06:18:07 jsg Exp $ */
/*
* Copyright (c) 2007 The DragonFly Project. All rights reserved.
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_et.c,v 1.17 2018/06/26 06:48:01 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_et.c,v 1.18 2018/12/09 11:14:02 jdolecek Exp $");
#include "opt_inet.h"
#include "vlan.h"
@@ -218,7 +218,8 @@ et_attach(device_t parent, device_t self
}
intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
- sc->sc_irq_handle = pci_intr_establish(pc, ih, IPL_NET, et_intr, sc);
+ sc->sc_irq_handle = pci_intr_establish_xname(pc, ih, IPL_NET, et_intr,
+ sc, device_xname(self));
if (sc->sc_irq_handle == NULL) {
aprint_error_dev(self, "could not establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/if_rtwn.c
diff -u src/sys/dev/pci/if_rtwn.c:1.17 src/sys/dev/pci/if_rtwn.c:1.18
--- src/sys/dev/pci/if_rtwn.c:1.17 Fri Jun 29 04:02:10 2018
+++ src/sys/dev/pci/if_rtwn.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rtwn.c,v 1.17 2018/06/29 04:02:10 thorpej Exp $ */
+/* $NetBSD: if_rtwn.c,v 1.18 2018/12/09 11:14:02 jdolecek Exp $ */
/* $OpenBSD: if_rtwn.c,v 1.5 2015/06/14 08:02:47 stsp Exp $ */
#define IEEE80211_NO_HT
/*-
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rtwn.c,v 1.17 2018/06/29 04:02:10 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rtwn.c,v 1.18 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -253,8 +253,8 @@ rtwn_attach(device_t parent, device_t se
}
intrstr = pci_intr_string(sc->sc_pc, sc->sc_pihp[0], intrbuf,
sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish(sc->sc_pc, sc->sc_pihp[0], IPL_NET,
- rtwn_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(sc->sc_pc, sc->sc_pihp[0], IPL_NET,
+ rtwn_intr, sc, device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "can't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/if_ex_pci.c
diff -u src/sys/dev/pci/if_ex_pci.c:1.57 src/sys/dev/pci/if_ex_pci.c:1.58
--- src/sys/dev/pci/if_ex_pci.c:1.57 Sat Mar 29 19:28:24 2014
+++ src/sys/dev/pci/if_ex_pci.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ex_pci.c,v 1.57 2014/03/29 19:28:24 christos Exp $ */
+/* $NetBSD: if_ex_pci.c,v 1.58 2018/12/09 11:14:02 jdolecek Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ex_pci.c,v 1.57 2014/03/29 19:28:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ex_pci.c,v 1.58 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -288,7 +288,8 @@ ex_pci_attach(device_t parent, device_t
}
intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, ex_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(pc, ih, IPL_NET, ex_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/if_fxp_pci.c
diff -u src/sys/dev/pci/if_fxp_pci.c:1.82 src/sys/dev/pci/if_fxp_pci.c:1.83
--- src/sys/dev/pci/if_fxp_pci.c:1.82 Mon Apr 13 16:33:25 2015
+++ src/sys/dev/pci/if_fxp_pci.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fxp_pci.c,v 1.82 2015/04/13 16:33:25 riastradh Exp $ */
+/* $NetBSD: if_fxp_pci.c,v 1.83 2018/12/09 11:14:02 jdolecek Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_fxp_pci.c,v 1.82 2015/04/13 16:33:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fxp_pci.c,v 1.83 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -507,7 +507,8 @@ fxp_pci_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, fxp_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(pc, ih, IPL_NET, fxp_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/if_iwi.c
diff -u src/sys/dev/pci/if_iwi.c:1.108 src/sys/dev/pci/if_iwi.c:1.109
--- src/sys/dev/pci/if_iwi.c:1.108 Mon Sep 3 16:29:32 2018
+++ src/sys/dev/pci/if_iwi.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iwi.c,v 1.108 2018/09/03 16:29:32 riastradh Exp $ */
+/* $NetBSD: if_iwi.c,v 1.109 2018/12/09 11:14:02 jdolecek Exp $ */
/* $OpenBSD: if_iwi.c,v 1.111 2010/11/15 19:11:57 damien Exp $ */
/*-
@@ -19,7 +19,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iwi.c,v 1.108 2018/09/03 16:29:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwi.c,v 1.109 2018/12/09 11:14:02 jdolecek Exp $");
/*-
* Intel(R) PRO/Wireless 2200BG/2225BG/2915ABG driver
@@ -256,7 +256,8 @@ iwi_attach(device_t parent, device_t sel
}
intrstr = pci_intr_string(sc->sc_pct, ih, intrbuf, sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish(sc->sc_pct, ih, IPL_NET, iwi_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(sc->sc_pct, ih, IPL_NET, iwi_intr,
+ sc, device_xname(self));
if (sc->sc_ih == NULL) {
softint_disestablish(sc->sc_soft_ih);
sc->sc_soft_ih = NULL;
Index: src/sys/dev/pci/if_kse.c
diff -u src/sys/dev/pci/if_kse.c:1.33 src/sys/dev/pci/if_kse.c:1.34
--- src/sys/dev/pci/if_kse.c:1.33 Wed Jul 18 23:10:28 2018
+++ src/sys/dev/pci/if_kse.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_kse.c,v 1.33 2018/07/18 23:10:28 sevan Exp $ */
+/* $NetBSD: if_kse.c,v 1.34 2018/12/09 11:14:02 jdolecek Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_kse.c,v 1.33 2018/07/18 23:10:28 sevan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_kse.c,v 1.34 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
@@ -420,7 +420,8 @@ kse_attach(device_t parent, device_t sel
return;
}
intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, kse_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(pc, ih, IPL_NET, kse_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/if_lii.c
diff -u src/sys/dev/pci/if_lii.c:1.18 src/sys/dev/pci/if_lii.c:1.19
--- src/sys/dev/pci/if_lii.c:1.18 Tue Jun 26 06:48:01 2018
+++ src/sys/dev/pci/if_lii.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_lii.c,v 1.18 2018/06/26 06:48:01 msaitoh Exp $ */
+/* $NetBSD: if_lii.c,v 1.19 2018/12/09 11:14:02 jdolecek Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_lii.c,v 1.18 2018/06/26 06:48:01 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_lii.c,v 1.19 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
@@ -293,7 +293,8 @@ lii_attach(device_t parent, device_t sel
goto fail;
}
intrstr = pci_intr_string(sc->sc_pc, ih, intrbuf, sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish(sc->sc_pc, ih, IPL_NET, lii_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(sc->sc_pc, ih, IPL_NET, lii_intr,
+ sc, device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "failed to establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/if_malo_pci.c
diff -u src/sys/dev/pci/if_malo_pci.c:1.6 src/sys/dev/pci/if_malo_pci.c:1.7
--- src/sys/dev/pci/if_malo_pci.c:1.6 Thu Feb 2 10:05:35 2017
+++ src/sys/dev/pci/if_malo_pci.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_malo_pci.c,v 1.6 2017/02/02 10:05:35 nonaka Exp $ */
+/* $NetBSD: if_malo_pci.c,v 1.7 2018/12/09 11:14:02 jdolecek Exp $ */
/* $OpenBSD: if_malo_pci.c,v 1.6 2010/08/28 23:19:29 deraadt Exp $ */
/*
@@ -22,7 +22,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_malo_pci.c,v 1.6 2017/02/02 10:05:35 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_malo_pci.c,v 1.7 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -164,7 +164,8 @@ malo_pci_attach(device_t parent, device_
/* establish interrupt */
intrstr = pci_intr_string(psc->sc_pc, ih, intrbuf, sizeof(intrbuf));
- psc->sc_ih = pci_intr_establish(psc->sc_pc, ih, IPL_NET, malo_intr, sc);
+ psc->sc_ih = pci_intr_establish_xname(psc->sc_pc, ih, IPL_NET,
+ malo_intr, sc, device_xname(self));
if (psc->sc_ih == NULL) {
aprint_error_dev(self, "could not establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/if_mtd_pci.c
diff -u src/sys/dev/pci/if_mtd_pci.c:1.20 src/sys/dev/pci/if_mtd_pci.c:1.21
--- src/sys/dev/pci/if_mtd_pci.c:1.20 Thu Jul 7 06:55:41 2016
+++ src/sys/dev/pci/if_mtd_pci.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mtd_pci.c,v 1.20 2016/07/07 06:55:41 msaitoh Exp $ */
+/* $NetBSD: if_mtd_pci.c,v 1.21 2018/12/09 11:14:02 jdolecek Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
/* TODO: Check why in IO space, the MII won't work. Memory mapped works */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mtd_pci.c,v 1.20 2016/07/07 06:55:41 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mtd_pci.c,v 1.21 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -130,7 +130,8 @@ mtd_pci_attach(device_t parent, device_t
}
intrstring = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf));
- if (pci_intr_establish(pa->pa_pc, ih, IPL_NET, mtd_irq_h, sc) == NULL) {
+ if (pci_intr_establish_xname(pa->pa_pc, ih, IPL_NET, mtd_irq_h, sc,
+ device_xname(self)) == NULL) {
aprint_error_dev(sc->dev, "could not establish interrupt");
if (intrstring != NULL)
aprint_error(" at %s", intrstring);
Index: src/sys/dev/pci/if_vte.c
diff -u src/sys/dev/pci/if_vte.c:1.20 src/sys/dev/pci/if_vte.c:1.21
--- src/sys/dev/pci/if_vte.c:1.20 Tue Jun 26 06:48:01 2018
+++ src/sys/dev/pci/if_vte.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vte.c,v 1.20 2018/06/26 06:48:01 msaitoh Exp $ */
+/* $NetBSD: if_vte.c,v 1.21 2018/12/09 11:14:02 jdolecek Exp $ */
/*
* Copyright (c) 2011 Manuel Bouyer. All rights reserved.
@@ -55,7 +55,7 @@
/* Driver for DM&P Electronics, Inc, Vortex86 RDC R6040 FastEthernet. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vte.c,v 1.20 2018/06/26 06:48:01 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vte.c,v 1.21 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -225,8 +225,8 @@ vte_attach(device_t parent, device_t sel
}
intrstr = pci_intr_string(pa->pa_pc, intrhandle, intrbuf,
sizeof(intrbuf));
- sc->vte_ih = pci_intr_establish(pa->pa_pc, intrhandle, IPL_NET,
- vte_intr, sc);
+ sc->vte_ih = pci_intr_establish_xname(pa->pa_pc, intrhandle, IPL_NET,
+ vte_intr, sc, device_xname(self));
if (sc->vte_ih == NULL) {
aprint_error_dev(self, "couldn't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/if_ral_pci.c
diff -u src/sys/dev/pci/if_ral_pci.c:1.24 src/sys/dev/pci/if_ral_pci.c:1.25
--- src/sys/dev/pci/if_ral_pci.c:1.24 Tue Jul 25 23:17:20 2017
+++ src/sys/dev/pci/if_ral_pci.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ral_pci.c,v 1.24 2017/07/25 23:17:20 maya Exp $ */
+/* $NetBSD: if_ral_pci.c,v 1.25 2018/12/09 11:14:02 jdolecek Exp $ */
/* $OpenBSD: if_ral_pci.c,v 1.24 2015/11/24 17:11:39 mpi Exp $ */
/*-
@@ -21,7 +21,7 @@
* PCI front-end for the Ralink RT2560/RT2561/RT2860/RT3090 driver.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ral_pci.c,v 1.24 2017/07/25 23:17:20 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ral_pci.c,v 1.25 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
@@ -217,8 +217,8 @@ ral_pci_attach(device_t parent, device_t
}
intrstr = pci_intr_string(psc->sc_pc, ih, intrbuf, sizeof(intrbuf));
- psc->sc_ih = pci_intr_establish(psc->sc_pc, ih, IPL_NET,
- psc->sc_opns->intr, sc);
+ psc->sc_ih = pci_intr_establish_xname(psc->sc_pc, ih, IPL_NET,
+ psc->sc_opns->intr, sc, device_xname(self));
if (psc->sc_ih == NULL) {
aprint_error(": could not establish interrupt");
Index: src/sys/dev/pci/if_rtk_pci.c
diff -u src/sys/dev/pci/if_rtk_pci.c:1.46 src/sys/dev/pci/if_rtk_pci.c:1.47
--- src/sys/dev/pci/if_rtk_pci.c:1.46 Sat May 9 21:53:45 2015
+++ src/sys/dev/pci/if_rtk_pci.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_rtk_pci.c,v 1.46 2015/05/09 21:53:45 christos Exp $ */
+/* $NetBSD: if_rtk_pci.c,v 1.47 2018/12/09 11:14:02 jdolecek Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_rtk_pci.c,v 1.46 2015/05/09 21:53:45 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_rtk_pci.c,v 1.47 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -215,7 +215,8 @@ rtk_pci_attach(device_t parent, device_t
return;
}
intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
- psc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, rtk_intr, sc);
+ psc->sc_ih = pci_intr_establish_xname(pc, ih, IPL_NET, rtk_intr, sc,
+ device_xname(self));
if (psc->sc_ih == NULL) {
aprint_error_dev(self, "couldn't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/if_sf_pci.c
diff -u src/sys/dev/pci/if_sf_pci.c:1.21 src/sys/dev/pci/if_sf_pci.c:1.22
--- src/sys/dev/pci/if_sf_pci.c:1.21 Thu Jul 7 06:55:41 2016
+++ src/sys/dev/pci/if_sf_pci.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_sf_pci.c,v 1.21 2016/07/07 06:55:41 msaitoh Exp $ */
+/* $NetBSD: if_sf_pci.c,v 1.22 2018/12/09 11:14:02 jdolecek Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sf_pci.c,v 1.21 2016/07/07 06:55:41 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sf_pci.c,v 1.22 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -241,7 +241,8 @@ sf_pci_attach(device_t parent, device_t
return;
}
intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf));
- psc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_NET, sf_intr, sc);
+ psc->sc_ih = pci_intr_establish_xname(pa->pa_pc, ih, IPL_NET, sf_intr,
+ sc, device_xname(self));
if (psc->sc_ih == NULL) {
aprint_error_dev(self, "unable to establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/jmide.c
diff -u src/sys/dev/pci/jmide.c:1.21 src/sys/dev/pci/jmide.c:1.22
--- src/sys/dev/pci/jmide.c:1.21 Thu Jul 14 10:19:06 2016
+++ src/sys/dev/pci/jmide.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: jmide.c,v 1.21 2016/07/14 10:19:06 msaitoh Exp $ */
+/* $NetBSD: jmide.c,v 1.22 2018/12/09 11:14:02 jdolecek Exp $ */
/*
* Copyright (c) 2007 Manuel Bouyer.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: jmide.c,v 1.21 2016/07/14 10:19:06 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: jmide.c,v 1.22 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -189,8 +189,8 @@ jmide_attach(device_t parent, device_t s
}
intrstr = pci_intr_string(pa->pa_pc, intrhandle, intrbuf,
sizeof(intrbuf));
- sc->sc_pciide.sc_pci_ih = pci_intr_establish(pa->pa_pc, intrhandle,
- IPL_BIO, jmide_intr, sc);
+ sc->sc_pciide.sc_pci_ih = pci_intr_establish_xname(pa->pa_pc,
+ intrhandle, IPL_BIO, jmide_intr, sc, device_xname(self));
if (sc->sc_pciide.sc_pci_ih == NULL) {
aprint_error("%s: couldn't establish interrupt", JM_NAME(sc));
return;
Index: src/sys/dev/pci/if_ste.c
diff -u src/sys/dev/pci/if_ste.c:1.51 src/sys/dev/pci/if_ste.c:1.52
--- src/sys/dev/pci/if_ste.c:1.51 Tue Jun 26 06:48:01 2018
+++ src/sys/dev/pci/if_ste.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ste.c,v 1.51 2018/06/26 06:48:01 msaitoh Exp $ */
+/* $NetBSD: if_ste.c,v 1.52 2018/12/09 11:14:02 jdolecek Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ste.c,v 1.51 2018/06/26 06:48:01 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ste.c,v 1.52 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
@@ -361,7 +361,8 @@ ste_attach(device_t parent, device_t sel
return;
}
intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, ste_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(pc, ih, IPL_NET, ste_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/mly.c
diff -u src/sys/dev/pci/mly.c:1.51 src/sys/dev/pci/mly.c:1.52
--- src/sys/dev/pci/mly.c:1.51 Mon Sep 3 16:29:32 2018
+++ src/sys/dev/pci/mly.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mly.c,v 1.51 2018/09/03 16:29:32 riastradh Exp $ */
+/* $NetBSD: mly.c,v 1.52 2018/12/09 11:14:02 jdolecek Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mly.c,v 1.51 2018/09/03 16:29:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mly.c,v 1.52 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -357,7 +357,8 @@ mly_attach(device_t parent, device_t sel
return;
}
intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
- mly->mly_ih = pci_intr_establish(pc, ih, IPL_BIO, mly_intr, mly);
+ mly->mly_ih = pci_intr_establish_xname(pc, ih, IPL_BIO, mly_intr, mly,
+ device_xname(self));
if (mly->mly_ih == NULL) {
aprint_error_dev(self, "can't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/voodoofb.c
diff -u src/sys/dev/pci/voodoofb.c:1.51 src/sys/dev/pci/voodoofb.c:1.52
--- src/sys/dev/pci/voodoofb.c:1.51 Mon Jul 11 11:31:51 2016
+++ src/sys/dev/pci/voodoofb.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: voodoofb.c,v 1.51 2016/07/11 11:31:51 msaitoh Exp $ */
+/* $NetBSD: voodoofb.c,v 1.52 2018/12/09 11:14:02 jdolecek Exp $ */
/*
* Copyright (c) 2005, 2006, 2012 Michael Lorenz
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: voodoofb.c,v 1.51 2016/07/11 11:31:51 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: voodoofb.c,v 1.52 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -525,8 +525,8 @@ voodoofb_attach(device_t parent, device_
}
intrstr = pci_intr_string(sc->sc_pc, ih, intrbuf, sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish(sc->sc_pc, ih, IPL_NET, voodoofb_intr,
- sc);
+ sc->sc_ih = pci_intr_establish_xname(sc->sc_pc, ih, IPL_NET,
+ voodoofb_intr, sc, device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "failed to establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/if_ti.c
diff -u src/sys/dev/pci/if_ti.c:1.105 src/sys/dev/pci/if_ti.c:1.106
--- src/sys/dev/pci/if_ti.c:1.105 Wed Jul 18 23:10:28 2018
+++ src/sys/dev/pci/if_ti.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ti.c,v 1.105 2018/07/18 23:10:28 sevan Exp $ */
+/* $NetBSD: if_ti.c,v 1.106 2018/12/09 11:14:02 jdolecek Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -81,7 +81,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ti.c,v 1.105 2018/07/18 23:10:28 sevan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ti.c,v 1.106 2018/12/09 11:14:02 jdolecek Exp $");
#include "opt_inet.h"
@@ -1664,7 +1664,8 @@ ti_attach(device_t parent, device_t self
return;
}
intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, ti_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(pc, ih, IPL_NET, ti_intr, sc,
+ device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(sc->sc_dev, "couldn't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/if_tl.c
diff -u src/sys/dev/pci/if_tl.c:1.109 src/sys/dev/pci/if_tl.c:1.110
--- src/sys/dev/pci/if_tl.c:1.109 Tue Jun 26 06:48:01 2018
+++ src/sys/dev/pci/if_tl.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tl.c,v 1.109 2018/06/26 06:48:01 msaitoh Exp $ */
+/* $NetBSD: if_tl.c,v 1.110 2018/12/09 11:14:02 jdolecek Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.109 2018/06/26 06:48:01 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tl.c,v 1.110 2018/12/09 11:14:02 jdolecek Exp $");
#undef TLDEBUG
#define TL_PRIV_STATS
@@ -393,8 +393,8 @@ tl_pci_attach(device_t parent, device_t
intrstr = pci_intr_string(pa->pa_pc, intrhandle, intrbuf,
sizeof(intrbuf));
sc->tl_if.if_softc = sc;
- sc->tl_ih = pci_intr_establish(pa->pa_pc, intrhandle, IPL_NET,
- tl_intr, sc);
+ sc->tl_ih = pci_intr_establish_xname(pa->pa_pc, intrhandle, IPL_NET,
+ tl_intr, sc, device_xname(self));
if (sc->tl_ih == NULL) {
aprint_error_dev(self, "couldn't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/if_tlp_pci.c
diff -u src/sys/dev/pci/if_tlp_pci.c:1.124 src/sys/dev/pci/if_tlp_pci.c:1.125
--- src/sys/dev/pci/if_tlp_pci.c:1.124 Thu Jul 7 06:55:41 2016
+++ src/sys/dev/pci/if_tlp_pci.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tlp_pci.c,v 1.124 2016/07/07 06:55:41 msaitoh Exp $ */
+/* $NetBSD: if_tlp_pci.c,v 1.125 2018/12/09 11:14:02 jdolecek Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tlp_pci.c,v 1.124 2016/07/07 06:55:41 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tlp_pci.c,v 1.125 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1011,9 +1011,9 @@ tlp_pci_attach(device_t parent, device_t
goto fail;
}
intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
- psc->sc_ih = pci_intr_establish(pc, ih, IPL_NET,
+ psc->sc_ih = pci_intr_establish_xname(pc, ih, IPL_NET,
(psc->sc_flags & TULIP_PCI_SHAREDINTR) ?
- tlp_pci_shared_intr : tlp_intr, sc);
+ tlp_pci_shared_intr : tlp_intr, sc, device_xname(self));
if (psc->sc_ih == NULL) {
aprint_error_dev(self, "unable to establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/if_vr.c
diff -u src/sys/dev/pci/if_vr.c:1.125 src/sys/dev/pci/if_vr.c:1.126
--- src/sys/dev/pci/if_vr.c:1.125 Wed Jul 18 23:10:28 2018
+++ src/sys/dev/pci/if_vr.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vr.c,v 1.125 2018/07/18 23:10:28 sevan Exp $ */
+/* $NetBSD: if_vr.c,v 1.126 2018/12/09 11:14:02 jdolecek Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.125 2018/07/18 23:10:28 sevan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vr.c,v 1.126 2018/12/09 11:14:02 jdolecek Exp $");
@@ -1562,8 +1562,8 @@ vr_attach(device_t parent, device_t self
}
intrstr = pci_intr_string(pa->pa_pc, intrhandle, intrbuf,
sizeof(intrbuf));
- sc->vr_ih = pci_intr_establish(pa->pa_pc, intrhandle, IPL_NET,
- vr_intr, sc);
+ sc->vr_ih = pci_intr_establish_xname(pa->pa_pc, intrhandle,
+ IPL_NET, vr_intr, sc, device_xname(self));
if (sc->vr_ih == NULL) {
aprint_error_dev(self, "couldn't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/if_wi_pci.c
diff -u src/sys/dev/pci/if_wi_pci.c:1.56 src/sys/dev/pci/if_wi_pci.c:1.57
--- src/sys/dev/pci/if_wi_pci.c:1.56 Thu Jul 14 04:00:46 2016
+++ src/sys/dev/pci/if_wi_pci.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wi_pci.c,v 1.56 2016/07/14 04:00:46 msaitoh Exp $ */
+/* $NetBSD: if_wi_pci.c,v 1.57 2018/12/09 11:14:02 jdolecek Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wi_pci.c,v 1.56 2016/07/14 04:00:46 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wi_pci.c,v 1.57 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -133,9 +133,9 @@ wi_pci_enable(device_t self, int onoff)
struct wi_softc *sc = &psc->psc_wi;
if (onoff) {
- /* establish the interrupt. */
- sc->sc_ih = pci_intr_establish(psc->psc_pc,
- psc->psc_ih, IPL_NET, wi_intr, sc);
+ /* XXX re-establishing interrupt shouldn't be needed */
+ sc->sc_ih = pci_intr_establish_xname(psc->psc_pc,
+ psc->psc_ih, IPL_NET, wi_intr, sc, device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(sc->sc_dev,
"couldn't establish interrupt\n");
@@ -320,7 +320,8 @@ wi_pci_attach(device_t parent, device_t
intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
psc->psc_ih = ih;
- sc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, wi_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(pc, ih, IPL_NET, wi_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/twa.c
diff -u src/sys/dev/pci/twa.c:1.56 src/sys/dev/pci/twa.c:1.57
--- src/sys/dev/pci/twa.c:1.56 Mon Sep 3 16:29:32 2018
+++ src/sys/dev/pci/twa.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: twa.c,v 1.56 2018/09/03 16:29:32 riastradh Exp $ */
+/* $NetBSD: twa.c,v 1.57 2018/12/09 11:14:02 jdolecek Exp $ */
/* $wasabi: twa.c,v 1.27 2006/07/28 18:17:21 wrstuden Exp $ */
/*-
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: twa.c,v 1.56 2018/09/03 16:29:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: twa.c,v 1.57 2018/12/09 11:14:02 jdolecek Exp $");
//#define TWA_DEBUG
@@ -1603,7 +1603,8 @@ twa_attach(device_t parent, device_t sel
}
intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
- sc->twa_ih = pci_intr_establish(pc, ih, IPL_BIO, twa_intr, sc);
+ sc->twa_ih = pci_intr_establish_xname(pc, ih, IPL_BIO, twa_intr, sc,
+ device_xname(self));
if (sc->twa_ih == NULL) {
aprint_error_dev(sc->twa_dv, "can't establish interrupt%s%s\n",
(intrstr) ? " at " : "",
Index: src/sys/dev/pci/if_wpi.c
diff -u src/sys/dev/pci/if_wpi.c:1.83 src/sys/dev/pci/if_wpi.c:1.84
--- src/sys/dev/pci/if_wpi.c:1.83 Mon Sep 3 16:29:32 2018
+++ src/sys/dev/pci/if_wpi.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wpi.c,v 1.83 2018/09/03 16:29:32 riastradh Exp $ */
+/* $NetBSD: if_wpi.c,v 1.84 2018/12/09 11:14:02 jdolecek Exp $ */
/*-
* Copyright (c) 2006, 2007
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.83 2018/09/03 16:29:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wpi.c,v 1.84 2018/12/09 11:14:02 jdolecek Exp $");
/*
* Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters.
@@ -271,8 +271,8 @@ wpi_attach(device_t parent __unused, dev
intrstr = pci_intr_string(sc->sc_pct, sc->sc_pihp[0], intrbuf,
sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish(sc->sc_pct, sc->sc_pihp[0], IPL_NET,
- wpi_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(sc->sc_pct, sc->sc_pihp[0],
+ IPL_NET, wpi_intr, sc, device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "could not establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/iha_pci.c
diff -u src/sys/dev/pci/iha_pci.c:1.19 src/sys/dev/pci/iha_pci.c:1.20
--- src/sys/dev/pci/iha_pci.c:1.19 Sat Mar 29 19:28:25 2014
+++ src/sys/dev/pci/iha_pci.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: iha_pci.c,v 1.19 2014/03/29 19:28:25 christos Exp $ */
+/* $NetBSD: iha_pci.c,v 1.20 2018/12/09 11:14:02 jdolecek Exp $ */
/*-
* Copyright (c) 2001 Izumi Tsutsui. All rights reserved.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iha_pci.c,v 1.19 2014/03/29 19:28:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iha_pci.c,v 1.20 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -144,7 +144,8 @@ iha_pci_attach(device_t parent, device_t
}
intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_BIO, iha_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(pa->pa_pc, ih, IPL_BIO, iha_intr,
+ sc, device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "couldn't establish interrupt");
Index: src/sys/dev/pci/mfi_pci.c
diff -u src/sys/dev/pci/mfi_pci.c:1.19 src/sys/dev/pci/mfi_pci.c:1.20
--- src/sys/dev/pci/mfi_pci.c:1.19 Thu Jul 14 04:00:46 2016
+++ src/sys/dev/pci/mfi_pci.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mfi_pci.c,v 1.19 2016/07/14 04:00:46 msaitoh Exp $ */
+/* $NetBSD: mfi_pci.c,v 1.20 2018/12/09 11:14:02 jdolecek Exp $ */
/* $OpenBSD: mfi_pci.c,v 1.11 2006/08/06 04:40:08 brad Exp $ */
/*
* Copyright (c) 2006 Marco Peereboom <[email protected]>
@@ -17,7 +17,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfi_pci.c,v 1.19 2016/07/14 04:00:46 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfi_pci.c,v 1.20 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -240,11 +240,11 @@ mfi_pci_attach(device_t parent, device_t
}
intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf));
if (mpd->mpd_iop == MFI_IOP_TBOLT) {
- sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_BIO,
- mfi_tbolt_intrh, sc);
+ sc->sc_ih = pci_intr_establish_xname(pa->pa_pc, ih, IPL_BIO,
+ mfi_tbolt_intrh, sc, device_xname(self));
} else {
- sc->sc_ih =
- pci_intr_establish(pa->pa_pc, ih, IPL_BIO, mfi_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(pa->pa_pc, ih, IPL_BIO,
+ mfi_intr, sc, device_xname(self));
}
if (!sc->sc_ih) {
aprint_error(": can't establish interrupt");
Index: src/sys/dev/pci/isp_pci.c
diff -u src/sys/dev/pci/isp_pci.c:1.119 src/sys/dev/pci/isp_pci.c:1.120
--- src/sys/dev/pci/isp_pci.c:1.119 Thu Jul 14 04:00:46 2016
+++ src/sys/dev/pci/isp_pci.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: isp_pci.c,v 1.119 2016/07/14 04:00:46 msaitoh Exp $ */
+/* $NetBSD: isp_pci.c,v 1.120 2018/12/09 11:14:02 jdolecek Exp $ */
/*
* Copyright (C) 1997, 1998, 1999 National Aeronautics & Space Administration
* All rights reserved.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isp_pci.c,v 1.119 2016/07/14 04:00:46 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isp_pci.c,v 1.120 2018/12/09 11:14:02 jdolecek Exp $");
#include <dev/ic/isp_netbsd.h>
#include <dev/pci/pcireg.h>
@@ -765,8 +765,8 @@ isp_pci_attach(device_t parent, device_t
intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf));
if (intrstr == NULL)
intrstr = "<I dunno>";
- pcs->pci_ih = pci_intr_establish(pa->pa_pc, ih, IPL_BIO,
- isp_pci_intr, isp);
+ pcs->pci_ih = pci_intr_establish_xname(pa->pa_pc, ih, IPL_BIO,
+ isp_pci_intr, isp, device_xname(self));
if (pcs->pci_ih == NULL) {
aprint_error_dev(self, "couldn't establish interrupt at %s\n",
intrstr);
Index: src/sys/dev/pci/mlx_pci.c
diff -u src/sys/dev/pci/mlx_pci.c:1.26 src/sys/dev/pci/mlx_pci.c:1.27
--- src/sys/dev/pci/mlx_pci.c:1.26 Tue Sep 27 03:33:32 2016
+++ src/sys/dev/pci/mlx_pci.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mlx_pci.c,v 1.26 2016/09/27 03:33:32 pgoyette Exp $ */
+/* $NetBSD: mlx_pci.c,v 1.27 2018/12/09 11:14:02 jdolecek Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mlx_pci.c,v 1.26 2016/09/27 03:33:32 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mlx_pci.c,v 1.27 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -272,7 +272,8 @@ mlx_pci_attach(device_t parent, device_t
return;
}
intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
- mlx->mlx_ih = pci_intr_establish(pc, ih, IPL_BIO, mlx_intr, mlx);
+ mlx->mlx_ih = pci_intr_establish_xname(pc, ih, IPL_BIO, mlx_intr, mlx,
+ device_xname(self));
if (mlx->mlx_ih == NULL) {
aprint_error_dev(self, "can't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/oboe.c
diff -u src/sys/dev/pci/oboe.c:1.45 src/sys/dev/pci/oboe.c:1.46
--- src/sys/dev/pci/oboe.c:1.45 Wed Oct 25 08:12:38 2017
+++ src/sys/dev/pci/oboe.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: oboe.c,v 1.45 2017/10/25 08:12:38 maya Exp $ */
+/* $NetBSD: oboe.c,v 1.46 2018/12/09 11:14:02 jdolecek Exp $ */
/* XXXXFVDL THIS DRIVER IS BROKEN FOR NON-i386 -- vtophys() usage */
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: oboe.c,v 1.45 2017/10/25 08:12:38 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oboe.c,v 1.46 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -215,7 +215,8 @@ oboe_attach(device_t parent, device_t se
return;
}
intrstring = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_IR, oboe_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(pa->pa_pc, ih, IPL_IR, oboe_intr,
+ sc, device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "couldn't establish interrupt");
if (intrstring != NULL)
Index: src/sys/dev/pci/pcscp.c
diff -u src/sys/dev/pci/pcscp.c:1.48 src/sys/dev/pci/pcscp.c:1.49
--- src/sys/dev/pci/pcscp.c:1.48 Fri Dec 22 13:58:11 2017
+++ src/sys/dev/pci/pcscp.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pcscp.c,v 1.48 2017/12/22 13:58:11 tsutsui Exp $ */
+/* $NetBSD: pcscp.c,v 1.49 2018/12/09 11:14:02 jdolecek Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcscp.c,v 1.48 2017/12/22 13:58:11 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcscp.c,v 1.49 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -284,8 +284,8 @@ pcscp_attach(device_t parent, device_t s
}
intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf));
- esc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_BIO,
- ncr53c9x_intr, esc);
+ esc->sc_ih = pci_intr_establish_xname(pa->pa_pc, ih, IPL_BIO,
+ ncr53c9x_intr, esc, device_xname(self));
if (esc->sc_ih == NULL) {
aprint_error(": couldn't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/rtsx_pci.c
diff -u src/sys/dev/pci/rtsx_pci.c:1.7 src/sys/dev/pci/rtsx_pci.c:1.8
--- src/sys/dev/pci/rtsx_pci.c:1.7 Tue Apr 24 18:34:30 2018
+++ src/sys/dev/pci/rtsx_pci.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: rtsx_pci.c,v 1.7 2018/04/24 18:34:30 maya Exp $ */
+/* $NetBSD: rtsx_pci.c,v 1.8 2018/12/09 11:14:02 jdolecek Exp $ */
/* $OpenBSD: rtsx_pci.c,v 1.7 2014/08/19 17:55:03 phessler Exp $ */
@@ -20,7 +20,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtsx_pci.c,v 1.7 2018/04/24 18:34:30 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsx_pci.c,v 1.8 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -154,8 +154,8 @@ rtsx_pci_attach(device_t parent, device_
return;
}
intrstr = pci_intr_string(pc, sc->sc_pihp[0], intrbuf, sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish(pc, sc->sc_pihp[0], IPL_SDMMC,
- rtsx_intr, &sc->sc);
+ sc->sc_ih = pci_intr_establish_xname(pc, sc->sc_pihp[0], IPL_SDMMC,
+ rtsx_intr, &sc->sc, device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "couldn't establish interrupt\n");
return;
Index: src/sys/dev/pci/satalink.c
diff -u src/sys/dev/pci/satalink.c:1.55 src/sys/dev/pci/satalink.c:1.56
--- src/sys/dev/pci/satalink.c:1.55 Fri Oct 20 07:06:08 2017
+++ src/sys/dev/pci/satalink.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: satalink.c,v 1.55 2017/10/20 07:06:08 jdolecek Exp $ */
+/* $NetBSD: satalink.c,v 1.56 2018/12/09 11:14:02 jdolecek Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: satalink.c,v 1.55 2017/10/20 07:06:08 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: satalink.c,v 1.56 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -750,9 +750,9 @@ sii3114_chip_map(struct pciide_softc *sc
return;
}
intrstr = pci_intr_string(pa->pa_pc, intrhandle, intrbuf, sizeof(intrbuf));
- sc->sc_pci_ih = pci_intr_establish(pa->pa_pc, intrhandle, IPL_BIO,
- /* XXX */
- pciide_pci_intr, sc);
+ sc->sc_pci_ih = pci_intr_establish_xname(pa->pa_pc, intrhandle, IPL_BIO,
+ /* XXX */
+ pciide_pci_intr, sc, device_xname(sc->sc_wdcdev.sc_atac.atac_dev));
if (sc->sc_pci_ih != NULL) {
aprint_normal_dev(sc->sc_wdcdev.sc_atac.atac_dev,
"using %s for native-PCI interrupt\n",
Index: src/sys/dev/pci/siop_pci_common.c
diff -u src/sys/dev/pci/siop_pci_common.c:1.36 src/sys/dev/pci/siop_pci_common.c:1.37
--- src/sys/dev/pci/siop_pci_common.c:1.36 Mon Oct 17 16:02:10 2016
+++ src/sys/dev/pci/siop_pci_common.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: siop_pci_common.c,v 1.36 2016/10/17 16:02:10 flxd Exp $ */
+/* $NetBSD: siop_pci_common.c,v 1.37 2018/12/09 11:14:02 jdolecek Exp $ */
/*
* Copyright (c) 2000 Manuel Bouyer.
@@ -27,7 +27,7 @@
/* SYM53c8xx PCI-SCSI I/O Processors driver: PCI front-end */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siop_pci_common.c,v 1.36 2016/10/17 16:02:10 flxd Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siop_pci_common.c,v 1.37 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -336,8 +336,8 @@ siop_pci_attach_common(struct siop_pci_c
return 0;
}
intrstr = pci_intr_string(pa->pa_pc, intrhandle, intrbuf, sizeof(intrbuf));
- pci_sc->sc_ih = pci_intr_establish(pa->pa_pc, intrhandle, IPL_BIO,
- intr, siop_sc);
+ pci_sc->sc_ih = pci_intr_establish_xname(pa->pa_pc, intrhandle, IPL_BIO,
+ intr, siop_sc, device_xname(siop_sc->sc_dev));
if (pci_sc->sc_ih != NULL) {
aprint_normal_dev(siop_sc->sc_dev, "interrupting at %s\n",
intrstr ? intrstr : "unknown interrupt");
Index: src/sys/dev/pci/tga.c
diff -u src/sys/dev/pci/tga.c:1.85 src/sys/dev/pci/tga.c:1.86
--- src/sys/dev/pci/tga.c:1.85 Sat Mar 29 19:28:25 2014
+++ src/sys/dev/pci/tga.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tga.c,v 1.85 2014/03/29 19:28:25 christos Exp $ */
+/* $NetBSD: tga.c,v 1.86 2018/12/09 11:14:02 jdolecek Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tga.c,v 1.85 2014/03/29 19:28:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tga.c,v 1.86 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -424,8 +424,8 @@ tgaattach(device_t parent, device_t self
return;
}
intrstr = pci_intr_string(pa->pa_pc, intrh, intrbuf, sizeof(intrbuf));
- sc->sc_intr = pci_intr_establish(pa->pa_pc, intrh, IPL_TTY, tga_intr,
- sc->sc_dc);
+ sc->sc_intr = pci_intr_establish_xname(pa->pa_pc, intrh, IPL_TTY,
+ tga_intr, sc->sc_dc, device_xname(self));
if (sc->sc_intr == NULL) {
aprint_error(": couldn't establish interrupt");
if (intrstr != NULL)
Index: src/sys/dev/pci/twe.c
diff -u src/sys/dev/pci/twe.c:1.106 src/sys/dev/pci/twe.c:1.107
--- src/sys/dev/pci/twe.c:1.106 Tue Sep 27 03:33:32 2016
+++ src/sys/dev/pci/twe.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: twe.c,v 1.106 2016/09/27 03:33:32 pgoyette Exp $ */
+/* $NetBSD: twe.c,v 1.107 2018/12/09 11:14:02 jdolecek Exp $ */
/*-
* Copyright (c) 2000, 2001, 2002, 2003, 2004 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: twe.c,v 1.106 2016/09/27 03:33:32 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: twe.c,v 1.107 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -352,7 +352,8 @@ twe_attach(device_t parent, device_t sel
}
intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish(pc, ih, IPL_BIO, twe_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(pc, ih, IPL_BIO, twe_intr, sc,
+ device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "can't establish interrupt%s%s\n",
(intrstr) ? " at " : "",
Index: src/sys/dev/pci/ubsec.c
diff -u src/sys/dev/pci/ubsec.c:1.44 src/sys/dev/pci/ubsec.c:1.45
--- src/sys/dev/pci/ubsec.c:1.44 Mon Sep 3 16:29:32 2018
+++ src/sys/dev/pci/ubsec.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ubsec.c,v 1.44 2018/09/03 16:29:32 riastradh Exp $ */
+/* $NetBSD: ubsec.c,v 1.45 2018/12/09 11:14:02 jdolecek Exp $ */
/* $FreeBSD: src/sys/dev/ubsec/ubsec.c,v 1.6.2.6 2003/01/23 21:06:43 sam Exp $ */
/* $OpenBSD: ubsec.c,v 1.143 2009/03/27 13:31:30 reyk Exp$ */
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ubsec.c,v 1.44 2018/09/03 16:29:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubsec.c,v 1.45 2018/12/09 11:14:02 jdolecek Exp $");
#undef UBSEC_DEBUG
@@ -411,7 +411,8 @@ ubsec_attach(device_t parent, device_t s
return;
}
intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish(pc, ih, IPL_NET, ubsec_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(pc, ih, IPL_NET, ubsec_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/viaide.c
diff -u src/sys/dev/pci/viaide.c:1.86 src/sys/dev/pci/viaide.c:1.87
--- src/sys/dev/pci/viaide.c:1.86 Fri Oct 20 07:06:08 2017
+++ src/sys/dev/pci/viaide.c Sun Dec 9 11:14:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: viaide.c,v 1.86 2017/10/20 07:06:08 jdolecek Exp $ */
+/* $NetBSD: viaide.c,v 1.87 2018/12/09 11:14:02 jdolecek Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: viaide.c,v 1.86 2017/10/20 07:06:08 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: viaide.c,v 1.87 2018/12/09 11:14:02 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1125,8 +1125,9 @@ via_sata_chip_map_new(struct pciide_soft
return;
}
intrstr = pci_intr_string(pa->pa_pc, intrhandle, intrbuf, sizeof(intrbuf));
- sc->sc_pci_ih = pci_intr_establish(pa->pa_pc,
- intrhandle, IPL_BIO, pciide_pci_intr, sc);
+ sc->sc_pci_ih = pci_intr_establish_xname(pa->pa_pc,
+ intrhandle, IPL_BIO, pciide_pci_intr, sc,
+ device_xname(sc->sc_wdcdev.sc_atac.atac_dev));
if (sc->sc_pci_ih == NULL) {
aprint_error_dev(sc->sc_wdcdev.sc_atac.atac_dev,
"couldn't establish native-PCI interrupt");
