[src/trunk]: src/sys/dev/pci provide intr xname

[jdolecek <jdolecek%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0946690d772b
branches:  trunk
changeset: 348286:0946690d772b
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Thu Oct 13 17:11:09 2016 +0000

description:
provide intr xname

diffstat:

 sys/dev/pci/ahcisata_pci.c  |  7 ++++---
 sys/dev/pci/bha_pci.c       |  7 ++++---
 sys/dev/pci/pciide_common.c |  9 +++++----
 sys/dev/pci/piixpm.c        |  8 ++++----
 4 files changed, 17 insertions(+), 14 deletions(-)

diffs (115 lines):

diff -r 0b9205c859d1 -r 0946690d772b sys/dev/pci/ahcisata_pci.c
--- a/sys/dev/pci/ahcisata_pci.c        Thu Oct 13 16:18:20 2016 +0000
+++ b/sys/dev/pci/ahcisata_pci.c        Thu Oct 13 17:11:09 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ahcisata_pci.c,v 1.37 2016/08/23 09:47:50 msaitoh Exp $        */
+/*     $NetBSD: ahcisata_pci.c,v 1.38 2016/10/13 17:11:09 jdolecek Exp $       */
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.37 2016/08/23 09:47:50 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.38 2016/10/13 17:11:09 jdolecek Exp $");
 
 #include <sys/types.h>
 #include <sys/malloc.h>
@@ -292,7 +292,8 @@
        }
        intrstr = pci_intr_string(pa->pa_pc, intrhandle,
            intrbuf, sizeof(intrbuf));
-       psc->sc_ih = pci_intr_establish(pa->pa_pc, intrhandle, IPL_BIO, ahci_intr, sc);
+       psc->sc_ih = pci_intr_establish_xname(pa->pa_pc, intrhandle, IPL_BIO,
+           ahci_intr, sc, device_xname(sc->sc_atac.atac_dev));
        if (psc->sc_ih == NULL) {
                aprint_error_dev(self, "couldn't establish interrupt\n");
                return;
diff -r 0b9205c859d1 -r 0946690d772b sys/dev/pci/bha_pci.c
--- a/sys/dev/pci/bha_pci.c     Thu Oct 13 16:18:20 2016 +0000
+++ b/sys/dev/pci/bha_pci.c     Thu Oct 13 17:11:09 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bha_pci.c,v 1.40 2014/10/18 08:33:28 snj Exp $ */
+/*     $NetBSD: bha_pci.c,v 1.41 2016/10/13 17:11:09 jdolecek Exp $    */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bha_pci.c,v 1.40 2014/10/18 08:33:28 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bha_pci.c,v 1.41 2016/10/13 17:11:09 jdolecek Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -133,7 +133,8 @@
                return;
        }
        intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
-       sc->sc_ih = pci_intr_establish(pc, ih, IPL_BIO, bha_intr, sc);
+       sc->sc_ih = pci_intr_establish_xname(pc, ih, IPL_BIO, bha_intr, sc,
+           device_xname(sc->sc_dev));
        if (sc->sc_ih == NULL) {
                aprint_error_dev(sc->sc_dev, "couldn't establish interrupt");
                if (intrstr != NULL)
diff -r 0b9205c859d1 -r 0946690d772b sys/dev/pci/pciide_common.c
--- a/sys/dev/pci/pciide_common.c       Thu Oct 13 16:18:20 2016 +0000
+++ b/sys/dev/pci/pciide_common.c       Thu Oct 13 17:11:09 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pciide_common.c,v 1.61 2016/07/07 06:55:41 msaitoh Exp $       */
+/*     $NetBSD: pciide_common.c,v 1.62 2016/10/13 17:11:09 jdolecek Exp $      */
 
 
 /*
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciide_common.c,v 1.61 2016/07/07 06:55:41 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide_common.c,v 1.62 2016/10/13 17:11:09 jdolecek Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
@@ -354,8 +354,9 @@
                        goto bad;
                }
                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",
diff -r 0b9205c859d1 -r 0946690d772b sys/dev/pci/piixpm.c
--- a/sys/dev/pci/piixpm.c      Thu Oct 13 16:18:20 2016 +0000
+++ b/sys/dev/pci/piixpm.c      Thu Oct 13 17:11:09 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: piixpm.c,v 1.50 2016/07/18 21:09:05 pgoyette Exp $ */
+/* $NetBSD: piixpm.c,v 1.51 2016/10/13 17:11:09 jdolecek Exp $ */
 /*     $OpenBSD: piixpm.c,v 1.20 2006/02/27 08:25:02 grange Exp $      */
 
 /*
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: piixpm.c,v 1.50 2016/07/18 21:09:05 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: piixpm.c,v 1.51 2016/10/13 17:11:09 jdolecek Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -256,8 +256,8 @@
                if (pci_intr_map(pa, &ih) == 0) {
                        intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf,
                            sizeof(intrbuf));
-                       sc->sc_smb_ih = pci_intr_establish(pa->pa_pc, ih,
-                           IPL_BIO, piixpm_intr, sc);
+                       sc->sc_smb_ih = pci_intr_establish_xname(pa->pa_pc, ih,
+                           IPL_BIO, piixpm_intr, sc, device_xname(sc->sc_dev));
                        if (sc->sc_smb_ih != NULL) {
                                aprint_normal("interrupting at %s", intrstr);
                                sc->sc_poll = 0;