CVS commit: [netbsd-8] src/sys/dev/pci

[Soren Jacobsen]

Module Name:    src
Committed By:   snj
Date:           Sun Jun 25 06:29:25 UTC 2017

Modified Files:
        src/sys/dev/pci [netbsd-8]: mvsata_pci.c siisata_pci.c

Log Message:
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()


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.22.1 src/sys/dev/pci/mvsata_pci.c
cvs rdiff -u -r1.14.10.1 -r1.14.10.2 src/sys/dev/pci/siisata_pci.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/mvsata_pci.c
diff -u src/sys/dev/pci/mvsata_pci.c:1.8 src/sys/dev/pci/mvsata_pci.c:1.8.22.1
--- src/sys/dev/pci/mvsata_pci.c:1.8	Sat Mar 29 19:28:25 2014
+++ src/sys/dev/pci/mvsata_pci.c	Sun Jun 25 06:29:25 2017
@@ -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 @@ mvsata_pci_attach(device_t parent, devic
 		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;

Index: src/sys/dev/pci/siisata_pci.c
diff -u src/sys/dev/pci/siisata_pci.c:1.14.10.1 src/sys/dev/pci/siisata_pci.c:1.14.10.2
--- src/sys/dev/pci/siisata_pci.c:1.14.10.1	Sun Jun 25 06:22:57 2017
+++ src/sys/dev/pci/siisata_pci.c	Sun Jun 25 06:29:25 2017
@@ -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 @@ siisata_pci_attach(device_t parent, devi
 	}
 	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);