From: jsg <jsg@openbsd.org>
Date: Fri, 30 Apr 2021 23:00:38 +0000 (+0000)
Subject: make timer/intc cd_name match config
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=8be9f5713c986d00f8002ffa840747fc24efeb37;p=openbsd

make timer/intc cd_name match config

ok kettenis@ mlarkin@
---

diff --git a/sys/arch/riscv64/dev/riscv_cpu_intc.c b/sys/arch/riscv64/dev/riscv_cpu_intc.c
index c0d7be67c39..799dc0c5baa 100644
--- a/sys/arch/riscv64/dev/riscv_cpu_intc.c
+++ b/sys/arch/riscv64/dev/riscv_cpu_intc.c
@@ -55,7 +55,7 @@ struct cfattach        intc_ca = {
 };
 
 struct cfdriver intc_cd = {
-       NULL, "rv_cpu_intc", DV_DULL
+       NULL, "intc", DV_DULL
 };
 
 int
diff --git a/sys/arch/riscv64/dev/timer.c b/sys/arch/riscv64/dev/timer.c
index 946e28d489b..849b0c91592 100644
--- a/sys/arch/riscv64/dev/timer.c
+++ b/sys/arch/riscv64/dev/timer.c
@@ -109,7 +109,7 @@ struct cfattach timer_ca = {
 };
 
 struct cfdriver timer_cd = {
-	NULL, "riscv_timer", DV_DULL
+	NULL, "timer", DV_DULL
 };
 
 static inline uint64_t
@@ -274,7 +274,7 @@ riscv_timer_cpu_initclocks()
 
 	/* configure virtual timer interrupt */
 	sc->sc_ih = riscv_intc_intr_establish(IRQ_TIMER_SUPERVISOR, 0,
-			riscv_timer_intr, NULL, "riscv_timer");
+			riscv_timer_intr, NULL, "timer");
 
 	next = get_cycles() + sc->sc_ticks_per_intr;
 	pc->pc_nexttickevent = pc->pc_nextstatevent = next;