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

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

details:   https://anonhg.NetBSD.org/src/rev/bc1fff938577
branches:  trunk
changeset: 446362:bc1fff938577
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Sun Dec 02 13:17:19 2018 +0000

description:
use pci_intr_establish_xname()

diffstat:

 sys/dev/pci/mpii.c    |  8 ++++----
 sys/dev/pci/mpt_pci.c |  7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diffs (57 lines):

diff -r af2065952b6f -r bc1fff938577 sys/dev/pci/mpii.c
--- a/sys/dev/pci/mpii.c        Sun Dec 02 10:51:07 2018 +0000
+++ b/sys/dev/pci/mpii.c        Sun Dec 02 13:17:19 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mpii.c,v 1.13 2018/11/24 18:11:22 bouyer Exp $ */
+/* $NetBSD: mpii.c,v 1.14 2018/12/02 13:22:28 jdolecek Exp $ */
 /*     OpenBSD: mpii.c,v 1.51 2012/04/11 13:29:14 naddy Exp    */
 /*
  * Copyright (c) 2010 Mike Belopuhov <mkb%crypt.org.ru@localhost>
@@ -20,7 +20,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpii.c,v 1.13 2018/11/24 18:11:22 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpii.c,v 1.14 2018/12/02 13:22:28 jdolecek Exp $");
 
 #include "bio.h"
 
@@ -621,8 +621,8 @@
                goto free_dev;
        }
 
-       sc->sc_ih = pci_intr_establish(sc->sc_pc, ih, IPL_BIO,
-           mpii_intr, sc);
+       sc->sc_ih = pci_intr_establish_xname(sc->sc_pc, ih, IPL_BIO,
+           mpii_intr, sc, DEVNAME(sc));
        if (sc->sc_ih == NULL) {
                aprint_error_dev(self, "can't establish interrupt");
                if (intrstr)
diff -r af2065952b6f -r bc1fff938577 sys/dev/pci/mpt_pci.c
--- a/sys/dev/pci/mpt_pci.c     Sun Dec 02 10:51:07 2018 +0000
+++ b/sys/dev/pci/mpt_pci.c     Sun Dec 02 13:17:19 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mpt_pci.c,v 1.25 2016/07/14 04:19:27 msaitoh Exp $     */
+/*     $NetBSD: mpt_pci.c,v 1.26 2018/12/02 13:17:19 jdolecek Exp $    */
 
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
@@ -46,7 +46,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpt_pci.c,v 1.25 2016/07/14 04:19:27 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpt_pci.c,v 1.26 2018/12/02 13:17:19 jdolecek Exp $");
 
 #include <dev/ic/mpt.h>                        /* pulls in all headers */
 
@@ -204,7 +204,8 @@
                return;
        }
        intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf));
-       psc->sc_ih = pci_intr_establish(pa->pa_pc, ih, IPL_BIO, mpt_intr, mpt);
+       psc->sc_ih = pci_intr_establish_xname(pa->pa_pc, ih, IPL_BIO, mpt_intr,
+           mpt, device_xname(mpt->sc_dev));
        if (psc->sc_ih == NULL) {
                aprint_error_dev(mpt->sc_dev, "unable to establish interrupt");
                if (intrstr != NULL)