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 c0d7be6..799dc0c 100644 (file)
--- 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 946e28d..849b0c9 100644 (file)
--- 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;