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

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

details:   https://anonhg.NetBSD.org/src/rev/8eb1df5c3da8
branches:  trunk
changeset: 446517:8eb1df5c3da8
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Sun Dec 09 10:06:56 2018 +0000

description:
use pci_intr_establish_xname()

upon code inspection, remove intr re-establish from ath_pci_resume() -
not needed to re-establish interrupt there, no other driver does this,
and very likely it would actually fail nowadays

diffstat:

 sys/dev/pci/if_ath_pci.c |  13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)

diffs (41 lines):

diff -r 5177c5733127 -r 8eb1df5c3da8 sys/dev/pci/if_ath_pci.c
--- a/sys/dev/pci/if_ath_pci.c  Sun Dec 09 00:45:18 2018 +0000
+++ b/sys/dev/pci/if_ath_pci.c  Sun Dec 09 10:06:56 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ath_pci.c,v 1.48 2014/03/29 19:28:24 christos Exp $ */
+/*     $NetBSD: if_ath_pci.c,v 1.49 2018/12/09 10:06:56 jdolecek Exp $ */
 
 /*-
  * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -63,7 +63,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ath_pci.c,v 1.48 2014/03/29 19:28:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ath_pci.c,v 1.49 2018/12/09 10:06:56 jdolecek Exp $");
 
 /*
  * PCI/Cardbus front-end for the Atheros Wireless LAN controller driver.
@@ -137,12 +137,6 @@
 {
        struct ath_pci_softc *sc = device_private(self);
 
-       sc->sc_ih = pci_intr_establish(sc->sc_pc, sc->sc_pih, IPL_NET, ath_intr,
-           &sc->sc_sc);
-       if (sc->sc_ih == NULL) {
-               aprint_error_dev(self, "couldn't map interrupt\n");
-               return false;
-       }
        return ath_resume(&sc->sc_sc);
 }
 
@@ -197,7 +191,8 @@
        }
 
        intrstr = pci_intr_string(pc, psc->sc_pih, intrbuf, sizeof(intrbuf));
-       psc->sc_ih = pci_intr_establish(pc, psc->sc_pih, IPL_NET, ath_intr, sc);
+       psc->sc_ih = pci_intr_establish_xname(pc, psc->sc_pih, IPL_NET,
+           ath_intr, sc, device_xname(self));
        if (psc->sc_ih == NULL) {
                aprint_error("couldn't map interrupt\n");
                goto bad1;