[src/trunk]: src/sys/dev/pci use pci_intr_establish_xname()

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

details:   https://anonhg.NetBSD.org/src/rev/f8cbfc52c43e
branches:  trunk
changeset: 991263:f8cbfc52c43e
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Wed Jul 04 19:26:09 2018 +0000

description:
use pci_intr_establish_xname()

diffstat:

 sys/dev/pci/if_msk.c |  7 ++++---
 sys/dev/pci/if_sk.c  |  7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diffs (56 lines):

diff -r 9dd2dc12e4d7 -r f8cbfc52c43e sys/dev/pci/if_msk.c
--- a/sys/dev/pci/if_msk.c      Wed Jul 04 19:20:25 2018 +0000
+++ b/sys/dev/pci/if_msk.c      Wed Jul 04 19:26:09 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_msk.c,v 1.70 2018/07/03 19:56:01 jdolecek Exp $ */
+/* $NetBSD: if_msk.c,v 1.71 2018/07/04 19:26:09 jdolecek Exp $ */
 /*     $OpenBSD: if_msk.c,v 1.79 2009/10/15 17:54:56 deraadt Exp $     */
 
 /*
@@ -52,7 +52,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.70 2018/07/03 19:56:01 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_msk.c,v 1.71 2018/07/04 19:26:09 jdolecek Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1375,7 +1375,8 @@
        }
 
        intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
-       sc->sk_intrhand = pci_intr_establish(pc, ih, IPL_NET, msk_intr, sc);
+       sc->sk_intrhand = pci_intr_establish_xname(pc, ih, IPL_NET, msk_intr,
+           sc, device_xname(sc->sk_dev));
        if (sc->sk_intrhand == NULL) {
                aprint_error(": couldn't establish interrupt");
                if (intrstr != NULL)
diff -r 9dd2dc12e4d7 -r f8cbfc52c43e sys/dev/pci/if_sk.c
--- a/sys/dev/pci/if_sk.c       Wed Jul 04 19:20:25 2018 +0000
+++ b/sys/dev/pci/if_sk.c       Wed Jul 04 19:26:09 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_sk.c,v 1.88 2018/07/03 18:07:36 jdolecek Exp $      */
+/*     $NetBSD: if_sk.c,v 1.89 2018/07/04 19:26:09 jdolecek Exp $      */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -115,7 +115,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.88 2018/07/03 18:07:36 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_sk.c,v 1.89 2018/07/04 19:26:09 jdolecek Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1631,7 +1631,8 @@
        }
 
        intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
-       sc->sk_intrhand = pci_intr_establish(pc, ih, IPL_NET, sk_intr, sc);
+       sc->sk_intrhand = pci_intr_establish_xname(pc, ih, IPL_NET, sk_intr, sc,
+           device_xname(sc->sk_dev));
        if (sc->sk_intrhand == NULL) {
                aprint_error(": couldn't establish interrupt");
                if (intrstr != NULL)