[src/netbsd-8]: src/sys/dev/pci Pull up following revision(s) (requested by j...

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

details:   https://anonhg.NetBSD.org/src/rev/1964edf86ce7
branches:  netbsd-8
changeset: 434033:1964edf86ce7
user:      snj <snj%NetBSD.org@localhost>
date:      Sun Jun 25 06:29:25 2017 +0000

description:
Pull up following revision(s) (requested by jdolecek in ticket #56):
        sys/dev/pci/mvsata_pci.c: revision 1.9
        sys/dev/pci/siisata_pci.c: revision 1.16
switch to pci_intr_establish_xname()

diffstat:

 sys/dev/pci/mvsata_pci.c  |  8 ++++----
 sys/dev/pci/siisata_pci.c |  8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs (58 lines):

diff -r 74eabb622f27 -r 1964edf86ce7 sys/dev/pci/mvsata_pci.c
--- a/sys/dev/pci/mvsata_pci.c  Sun Jun 25 06:24:25 2017 +0000
+++ b/sys/dev/pci/mvsata_pci.c  Sun Jun 25 06:29:25 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mvsata_pci.c,v 1.8 2014/03/29 19:28:25 christos Exp $  */
+/*     $NetBSD: mvsata_pci.c,v 1.8.22.1 2017/06/25 06:29:25 snj Exp $  */
 /*
  * Copyright (c) 2008 KIYOHARA Takashi
  * All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvsata_pci.c,v 1.8 2014/03/29 19:28:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvsata_pci.c,v 1.8.22.1 2017/06/25 06:29:25 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -194,8 +194,8 @@
                return;
        }
        intrstr = pci_intr_string(psc->psc_pc, intrhandle, intrbuf, sizeof(intrbuf));
-       psc->psc_ih = pci_intr_establish(psc->psc_pc, intrhandle, IPL_BIO,
-           mvsata_pci_intr, sc);
+       psc->psc_ih = pci_intr_establish_xname(psc->psc_pc, intrhandle, IPL_BIO,
+           mvsata_pci_intr, sc, device_xname(self));
        if (psc->psc_ih == NULL) {
                aprint_error_dev(self, "couldn't establish interrupt\n");
                return;
diff -r 74eabb622f27 -r 1964edf86ce7 sys/dev/pci/siisata_pci.c
--- a/sys/dev/pci/siisata_pci.c Sun Jun 25 06:24:25 2017 +0000
+++ b/sys/dev/pci/siisata_pci.c Sun Jun 25 06:29:25 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: siisata_pci.c,v 1.14.10.1 2017/06/25 06:22:57 snj Exp $ */
+/* $NetBSD: siisata_pci.c,v 1.14.10.2 2017/06/25 06:29:25 snj Exp $ */
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -51,7 +51,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siisata_pci.c,v 1.14.10.1 2017/06/25 06:22:57 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siisata_pci.c,v 1.14.10.2 2017/06/25 06:29:25 snj Exp $");
 
 #include <sys/types.h>
 #include <sys/malloc.h>
@@ -217,8 +217,8 @@
        }
        intrstr = pci_intr_string(pa->pa_pc, intrhandle, intrbuf,
            sizeof(intrbuf));
-       psc->sc_ih = pci_intr_establish(pa->pa_pc, intrhandle,
-           IPL_BIO, siisata_intr, sc);
+       psc->sc_ih = pci_intr_establish_xname(pa->pa_pc, intrhandle,
+           IPL_BIO, siisata_intr, sc, device_xname(self));
        if (psc->sc_ih == NULL) {
                bus_space_unmap(sc->sc_grt, sc->sc_grh, grsize);
                bus_space_unmap(sc->sc_prt, sc->sc_prh, prsize);