Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/evbppc/explora/dev Convert to intr_establish_xname().



details:   https://anonhg.NetBSD.org/src/rev/fc4bd5feed22
branches:  trunk
changeset: 959978:fc4bd5feed22
user:      rin <rin%NetBSD.org@localhost>
date:      Tue Mar 02 12:01:02 2021 +0000

description:
Convert to intr_establish_xname().

diffstat:

 sys/arch/evbppc/explora/dev/com_elb.c   |  7 ++++---
 sys/arch/evbppc/explora/dev/le_elb.c    |  7 ++++---
 sys/arch/evbppc/explora/dev/pckbc_elb.c |  7 ++++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diffs (82 lines):

diff -r 4a0d41c4c694 -r fc4bd5feed22 sys/arch/evbppc/explora/dev/com_elb.c
--- a/sys/arch/evbppc/explora/dev/com_elb.c     Tue Mar 02 11:59:49 2021 +0000
+++ b/sys/arch/evbppc/explora/dev/com_elb.c     Tue Mar 02 12:01:02 2021 +0000
@@ -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_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));
 }
diff -r 4a0d41c4c694 -r fc4bd5feed22 sys/arch/evbppc/explora/dev/le_elb.c
--- a/sys/arch/evbppc/explora/dev/le_elb.c      Tue Mar 02 11:59:49 2021 +0000
+++ b/sys/arch/evbppc/explora/dev/le_elb.c      Tue Mar 02 12:01:02 2021 +0000
@@ -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 @@
        /* 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));
 }
 
 /*
diff -r 4a0d41c4c694 -r fc4bd5feed22 sys/arch/evbppc/explora/dev/pckbc_elb.c
--- a/sys/arch/evbppc/explora/dev/pckbc_elb.c   Tue Mar 02 11:59:49 2021 +0000
+++ b/sys/arch/evbppc/explora/dev/pckbc_elb.c   Tue Mar 02 12:01:02 2021 +0000
@@ -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 @@
         */
 
        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;
 }



Home | Main Index | Thread Index | Old Index