Thu Oct 13 17:11:09 2016 UTC ()
provide intr xname
(jdolecek)
diff -r1.37 -r1.38 src/sys/dev/pci/ahcisata_pci.c
diff -r1.40 -r1.41 src/sys/dev/pci/bha_pci.c
diff -r1.61 -r1.62 src/sys/dev/pci/pciide_common.c
diff -r1.50 -r1.51 src/sys/dev/pci/piixpm.c
--- src/sys/dev/pci/ahcisata_pci.c 2016/08/23 09:47:50 1.37
+++ src/sys/dev/pci/ahcisata_pci.c 2016/10/13 17:11:09 1.38
@@ -1,4 +1,4 @@
-/* $NetBSD: ahcisata_pci.c,v 1.37 2016/08/23 09:47:50 msaitoh Exp $ */
+/* $NetBSD: ahcisata_pci.c,v 1.38 2016/10/13 17:11:09 jdolecek Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.37 2016/08/23 09:47:50 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahcisata_pci.c,v 1.38 2016/10/13 17:11:09 jdolecek Exp $");
#include <sys/types.h>
#include <sys/malloc.h>
@@ -292,7 +292,8 @@
}
intrstr = pci_intr_string(pa->pa_pc, intrhandle,
intrbuf, sizeof(intrbuf));
- psc->sc_ih = pci_intr_establish(pa->pa_pc, intrhandle, IPL_BIO, ahci_intr, sc);
+ psc->sc_ih = pci_intr_establish_xname(pa->pa_pc, intrhandle, IPL_BIO,
+ ahci_intr, sc, device_xname(sc->sc_atac.atac_dev));
if (psc->sc_ih == NULL) {
aprint_error_dev(self, "couldn't establish interrupt\n");
return;
--- src/sys/dev/pci/bha_pci.c 2014/10/18 08:33:28 1.40
+++ src/sys/dev/pci/bha_pci.c 2016/10/13 17:11:09 1.41
@@ -1,4 +1,4 @@
-/* $NetBSD: bha_pci.c,v 1.40 2014/10/18 08:33:28 snj Exp $ */
+/* $NetBSD: bha_pci.c,v 1.41 2016/10/13 17:11:09 jdolecek Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bha_pci.c,v 1.40 2014/10/18 08:33:28 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bha_pci.c,v 1.41 2016/10/13 17:11:09 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -133,7 +133,8 @@
return;
}
intrstr = pci_intr_string(pc, ih, intrbuf, sizeof(intrbuf));
- sc->sc_ih = pci_intr_establish(pc, ih, IPL_BIO, bha_intr, sc);
+ sc->sc_ih = pci_intr_establish_xname(pc, ih, IPL_BIO, bha_intr, sc,
+ device_xname(sc->sc_dev));
if (sc->sc_ih == NULL) {
aprint_error_dev(sc->sc_dev, "couldn't establish interrupt");
if (intrstr != NULL)
--- src/sys/dev/pci/pciide_common.c 2016/07/07 06:55:41 1.61
+++ src/sys/dev/pci/pciide_common.c 2016/10/13 17:11:09 1.62
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_common.c,v 1.61 2016/07/07 06:55:41 msaitoh Exp $ */
+/* $NetBSD: pciide_common.c,v 1.62 2016/10/13 17:11:09 jdolecek Exp $ */
/*
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciide_common.c,v 1.61 2016/07/07 06:55:41 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide_common.c,v 1.62 2016/10/13 17:11:09 jdolecek Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -354,8 +354,9 @@
goto bad;
}
intrstr = pci_intr_string(pa->pa_pc, intrhandle, intrbuf, sizeof(intrbuf));
- sc->sc_pci_ih = pci_intr_establish(pa->pa_pc,
- intrhandle, IPL_BIO, pci_intr, sc);
+ sc->sc_pci_ih = pci_intr_establish_xname(pa->pa_pc,
+ intrhandle, IPL_BIO, pci_intr, sc,
+ device_xname(sc->sc_wdcdev.sc_atac.atac_dev));
if (sc->sc_pci_ih != NULL) {
aprint_normal_dev(sc->sc_wdcdev.sc_atac.atac_dev,
"using %s for native-PCI interrupt\n",
--- src/sys/dev/pci/piixpm.c 2016/07/18 21:09:05 1.50
+++ src/sys/dev/pci/piixpm.c 2016/10/13 17:11:09 1.51
@@ -1,4 +1,4 @@
-/* $NetBSD: piixpm.c,v 1.50 2016/07/18 21:09:05 pgoyette Exp $ */
+/* $NetBSD: piixpm.c,v 1.51 2016/10/13 17:11:09 jdolecek Exp $ */
/* $OpenBSD: piixpm.c,v 1.20 2006/02/27 08:25:02 grange Exp $ */
/*
@@ -22,7 +22,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: piixpm.c,v 1.50 2016/07/18 21:09:05 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: piixpm.c,v 1.51 2016/10/13 17:11:09 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -256,8 +256,8 @@
if (pci_intr_map(pa, &ih) == 0) {
intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf,
sizeof(intrbuf));
- sc->sc_smb_ih = pci_intr_establish(pa->pa_pc, ih,
- IPL_BIO, piixpm_intr, sc);
+ sc->sc_smb_ih = pci_intr_establish_xname(pa->pa_pc, ih,
+ IPL_BIO, piixpm_intr, sc, device_xname(sc->sc_dev));
if (sc->sc_smb_ih != NULL) {
aprint_normal("interrupting at %s", intrstr);
sc->sc_poll = 0;