Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/pci use pci_intr_establish_xname() everywhere
details: https://anonhg.NetBSD.org/src/rev/b5a98ef3347f
branches: trunk
changeset: 446520:b5a98ef3347f
user: jdolecek <jdolecek%NetBSD.org@localhost>
date: Sun Dec 09 11:14:01 2018 +0000
description:
use pci_intr_establish_xname() everywhere
diffstat:
sys/dev/pci/aac_pci.c | 11 ++++++-----
sys/dev/pci/adv_pci.c | 7 ++++---
sys/dev/pci/adw_pci.c | 7 ++++---
sys/dev/pci/ahc_pci.c | 7 ++++---
sys/dev/pci/ahd_pci.c | 7 ++++---
sys/dev/pci/amr.c | 7 ++++---
sys/dev/pci/arcmsr.c | 8 ++++----
sys/dev/pci/artsata.c | 9 +++++----
sys/dev/pci/atppc_puc.c | 8 ++++----
sys/dev/pci/auacer.c | 8 ++++----
sys/dev/pci/auixp.c | 7 ++++---
sys/dev/pci/auvia.c | 7 ++++---
sys/dev/pci/azalia.c | 7 ++++---
sys/dev/pci/btvmei.c | 7 ++++---
sys/dev/pci/cac_pci.c | 7 ++++---
sys/dev/pci/ciss_pci.c | 7 ++++---
sys/dev/pci/cmpci.c | 8 ++++----
sys/dev/pci/coram.c | 7 ++++---
sys/dev/pci/cs4280.c | 8 ++++----
sys/dev/pci/cs4281.c | 8 ++++----
sys/dev/pci/cxdtv.c | 7 ++++---
sys/dev/pci/cy_pci.c | 7 ++++---
sys/dev/pci/cz.c | 8 ++++----
sys/dev/pci/dpt_pci.c | 7 ++++---
sys/dev/pci/eap.c | 7 ++++---
sys/dev/pci/emuxki.c | 10 +++++-----
sys/dev/pci/esa.c | 7 ++++---
sys/dev/pci/esm.c | 7 ++++---
sys/dev/pci/eso.c | 7 ++++---
sys/dev/pci/fms.c | 7 ++++---
sys/dev/pci/gcscaudio.c | 8 ++++----
sys/dev/pci/icp_pci.c | 7 ++++---
sys/dev/pci/if_age.c | 8 ++++----
sys/dev/pci/if_alc.c | 5 +++--
sys/dev/pci/if_ale.c | 7 ++++---
sys/dev/pci/if_an_pci.c | 7 ++++---
sys/dev/pci/if_athn_pci.c | 13 +++++++------
sys/dev/pci/if_atw_pci.c | 14 +++++++-------
sys/dev/pci/if_bce.c | 7 ++++---
sys/dev/pci/if_bwfm_pci.c | 6 +++---
sys/dev/pci/if_bwi_pci.c | 7 ++++---
sys/dev/pci/if_cas.c | 8 ++++----
sys/dev/pci/if_de.c | 8 ++++----
sys/dev/pci/if_dge.c | 7 ++++---
sys/dev/pci/if_ep_pci.c | 7 ++++---
sys/dev/pci/if_epic_pci.c | 7 ++++---
sys/dev/pci/if_esh_pci.c | 7 ++++---
sys/dev/pci/if_et.c | 7 ++++---
sys/dev/pci/if_ex_pci.c | 7 ++++---
sys/dev/pci/if_fpa.c | 7 ++++---
sys/dev/pci/if_fxp_pci.c | 7 ++++---
sys/dev/pci/if_gem_pci.c | 8 ++++----
sys/dev/pci/if_hme_pci.c | 7 ++++---
sys/dev/pci/if_ipw.c | 7 ++++---
sys/dev/pci/if_iwi.c | 7 ++++---
sys/dev/pci/if_jme.c | 8 ++++----
sys/dev/pci/if_kse.c | 7 ++++---
sys/dev/pci/if_le_pci.c | 7 ++++---
sys/dev/pci/if_lii.c | 7 ++++---
sys/dev/pci/if_lmc.c | 10 +++++-----
sys/dev/pci/if_malo_pci.c | 7 ++++---
sys/dev/pci/if_mtd_pci.c | 7 ++++---
sys/dev/pci/if_ne_pci.c | 7 ++++---
sys/dev/pci/if_nfe.c | 7 ++++---
sys/dev/pci/if_ntwoc_pci.c | 8 ++++----
sys/dev/pci/if_ral_pci.c | 8 ++++----
sys/dev/pci/if_rtk_pci.c | 7 ++++---
sys/dev/pci/if_rtw_pci.c | 14 +++++++-------
sys/dev/pci/if_rtwn.c | 8 ++++----
sys/dev/pci/if_sf_pci.c | 7 ++++---
sys/dev/pci/if_ste.c | 7 ++++---
sys/dev/pci/if_stge.c | 7 ++++---
sys/dev/pci/if_ti.c | 7 ++++---
sys/dev/pci/if_tl.c | 8 ++++----
sys/dev/pci/if_tlp_pci.c | 8 ++++----
sys/dev/pci/if_txp.c | 7 ++++---
sys/dev/pci/if_vge.c | 7 ++++---
sys/dev/pci/if_vr.c | 8 ++++----
sys/dev/pci/if_vte.c | 8 ++++----
sys/dev/pci/if_wi_pci.c | 13 +++++++------
sys/dev/pci/if_wpi.c | 8 ++++----
sys/dev/pci/if_xge.c | 9 +++++----
sys/dev/pci/iha_pci.c | 7 ++++---
sys/dev/pci/iop_pci.c | 7 ++++---
sys/dev/pci/isp_pci.c | 8 ++++----
sys/dev/pci/jmide.c | 8 ++++----
sys/dev/pci/mfi_pci.c | 12 ++++++------
sys/dev/pci/mlx_pci.c | 7 ++++---
sys/dev/pci/mly.c | 7 ++++---
sys/dev/pci/neo.c | 7 ++++---
sys/dev/pci/njs_pci.c | 9 +++++----
sys/dev/pci/oboe.c | 7 ++++---
sys/dev/pci/pcscp.c | 8 ++++----
sys/dev/pci/pdcsata.c | 12 +++++++-----
sys/dev/pci/rtsx_pci.c | 8 ++++----
sys/dev/pci/satalink.c | 10 +++++-----
sys/dev/pci/siop_pci_common.c | 8 ++++----
sys/dev/pci/sv.c | 7 ++++---
sys/dev/pci/svwsata.c | 8 ++++----
sys/dev/pci/tga.c | 8 ++++----
sys/dev/pci/trm.c | 7 ++++---
sys/dev/pci/twa.c | 7 ++++---
sys/dev/pci/twe.c | 7 ++++---
sys/dev/pci/ubsec.c | 7 ++++---
sys/dev/pci/universe_pci.c | 7 ++++---
sys/dev/pci/viaide.c | 9 +++++----
sys/dev/pci/voodoofb.c | 8 ++++----
sys/dev/pci/voyager.c | 9 +++++----
sys/dev/pci/yds.c | 7 ++++---
109 files changed, 461 insertions(+), 387 deletions(-)
diffs (truncated from 3171 to 300 lines):
diff -r 2c088af76c96 -r b5a98ef3347f sys/dev/pci/aac_pci.c
--- a/sys/dev/pci/aac_pci.c Sun Dec 09 11:12:58 2018 +0000
+++ b/sys/dev/pci/aac_pci.c Sun Dec 09 11:14:01 2018 +0000
@@ -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 @@
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 @@
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)
diff -r 2c088af76c96 -r b5a98ef3347f sys/dev/pci/adv_pci.c
--- a/sys/dev/pci/adv_pci.c Sun Dec 09 11:12:58 2018 +0000
+++ b/sys/dev/pci/adv_pci.c Sun Dec 09 11:14:01 2018 +0000
@@ -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 @@
/*
* 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)
diff -r 2c088af76c96 -r b5a98ef3347f sys/dev/pci/adw_pci.c
--- a/sys/dev/pci/adw_pci.c Sun Dec 09 11:12:58 2018 +0000
+++ b/sys/dev/pci/adw_pci.c Sun Dec 09 11:14:01 2018 +0000
@@ -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 @@
/*
* 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)
diff -r 2c088af76c96 -r b5a98ef3347f sys/dev/pci/ahc_pci.c
--- a/sys/dev/pci/ahc_pci.c Sun Dec 09 11:12:58 2018 +0000
+++ b/sys/dev/pci/ahc_pci.c Sun Dec 09 11:14:01 2018 +0000
@@ -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 @@
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");
diff -r 2c088af76c96 -r b5a98ef3347f sys/dev/pci/ahd_pci.c
--- a/sys/dev/pci/ahd_pci.c Sun Dec 09 11:12:58 2018 +0000
+++ b/sys/dev/pci/ahd_pci.c Sun Dec 09 11:14:01 2018 +0000
@@ -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 @@
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));
diff -r 2c088af76c96 -r b5a98ef3347f sys/dev/pci/amr.c
--- a/sys/dev/pci/amr.c Sun Dec 09 11:12:58 2018 +0000
+++ b/sys/dev/pci/amr.c Sun Dec 09 11:14:01 2018 +0000
@@ -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 @@
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)
diff -r 2c088af76c96 -r b5a98ef3347f sys/dev/pci/arcmsr.c
--- a/sys/dev/pci/arcmsr.c Sun Dec 09 11:12:58 2018 +0000
+++ b/sys/dev/pci/arcmsr.c Sun Dec 09 11:14:01 2018 +0000
@@ -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 @@
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;
diff -r 2c088af76c96 -r b5a98ef3347f sys/dev/pci/artsata.c
--- a/sys/dev/pci/artsata.c Sun Dec 09 11:12:58 2018 +0000
+++ b/sys/dev/pci/artsata.c Sun Dec 09 11:14:01 2018 +0000
@@ -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 @@
}
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);
diff -r 2c088af76c96 -r b5a98ef3347f sys/dev/pci/atppc_puc.c
--- a/sys/dev/pci/atppc_puc.c Sun Dec 09 11:12:58 2018 +0000
+++ b/sys/dev/pci/atppc_puc.c Sun Dec 09 11:14:01 2018 +0000
@@ -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 @@
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)
diff -r 2c088af76c96 -r b5a98ef3347f sys/dev/pci/auacer.c
--- a/sys/dev/pci/auacer.c Sun Dec 09 11:12:58 2018 +0000
+++ b/sys/dev/pci/auacer.c Sun Dec 09 11:14:01 2018 +0000
@@ -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 @@
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)
diff -r 2c088af76c96 -r b5a98ef3347f sys/dev/pci/auixp.c
Home |
Main Index |
Thread Index |
Old Index