Console: Use simple unwrapping outside kernel.panic()

2 files changed, 2 insertions, 4 deletions

diff --git a/src/kernel.zig b/src/kernel.zig
index bc93e31..648946d 100644
--- a/src/kernel.zig
+++ b/src/kernel.zig
@@ -121,8 +121,7 @@ fn pagedMain() noreturn {
 }
 
 fn pagedRun() !noreturn {
-    const console = Console.autoChoose() orelse halt();
-    const w = console.writer();
+    const w = Console.autoChoose().?.writer();
 
     try w.print("\r\n", .{});
     try w.print("Console init\r\n", .{});
diff --git a/src/lib/interrupts.zig b/src/lib/interrupts.zig
index 5cb6fb9..8988c0a 100644
--- a/src/lib/interrupts.zig
+++ b/src/lib/interrupts.zig
@@ -86,8 +86,7 @@ pub const SyncCause = enum(u63) {
 };
 
 export fn handleTrap(epc: usize, cause_bits: usize, frame: *TrapFrame) usize {
-    const console = Console.autoChoose().?;
-    const w = console.writer();
+    const w = Console.autoChoose().?.writer();
 
     const status = riscv.sstatus.read();