Convert to intr_establish_xname().

This commit is contained in:
rin 2021-03-02 12:01:02 +00:00
parent 5b00ec55f8
commit dea2c7b807
3 changed files with 12 additions and 9 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: com_elb.c,v 1.10 2018/12/08 17:46:11 thorpej Exp $ */
/* $NetBSD: com_elb.c,v 1.11 2021/03/02 12:01:02 rin Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: com_elb.c,v 1.10 2018/12/08 17:46:11 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: com_elb.c,v 1.11 2021/03/02 12:01:02 rin Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@ -87,5 +87,6 @@ com_elb_attach(device_t parent, device_t self, void *aux)
com_attach_subr(sc);
intr_establish(eaa->elb_irq, IST_LEVEL, IPL_SERIAL, comintr, sc);
intr_establish_xname(eaa->elb_irq, IST_LEVEL, IPL_SERIAL, comintr, sc,
device_xname(self));
}

View File

@ -1,4 +1,4 @@
/* $NetBSD: le_elb.c,v 1.9 2011/07/01 19:02:32 dyoung Exp $ */
/* $NetBSD: le_elb.c,v 1.10 2021/03/02 12:01:02 rin Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: le_elb.c,v 1.9 2011/07/01 19:02:32 dyoung Exp $");
__KERNEL_RCSID(0, "$NetBSD: le_elb.c,v 1.10 2021/03/02 12:01:02 rin Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@ -170,7 +170,8 @@ le_elb_attach(device_t parent, device_t self, void *aux)
/* Chip is stopped. Set "software style" to 32-bit. */
le_wrcsr(sc, LE_CSR58, 2);
intr_establish(eaa->elb_irq, IST_LEVEL, IPL_NET, am79900_intr, sc);
intr_establish_xname(eaa->elb_irq, IST_LEVEL, IPL_NET, am79900_intr,
sc, device_xname(self));
}
/*

View File

@ -1,4 +1,4 @@
/* $NetBSD: pckbc_elb.c,v 1.9 2021/03/02 11:59:49 rin Exp $ */
/* $NetBSD: pckbc_elb.c,v 1.10 2021/03/02 12:01:02 rin Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pckbc_elb.c,v 1.9 2021/03/02 11:59:49 rin Exp $");
__KERNEL_RCSID(0, "$NetBSD: pckbc_elb.c,v 1.10 2021/03/02 12:01:02 rin Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@ -116,7 +116,8 @@ pckbc_elb_intr_establish(struct pckbc_softc *sc, pckbc_slot_t slot)
*/
if (irq >= 0)
intr_establish(irq, IST_LEVEL, IPL_SERIAL, pckbcintr, sc);
intr_establish_xname(irq, IST_LEVEL, IPL_SERIAL, pckbcintr, sc,
device_xname(sc->sc_dv));
msc->sc_irq = -1;
}