commit dae36d141ddc097d9991f5cc547d2459bfc3bee3
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Sep 20 10:13:34 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 20 10:13:34 2023 +0000
tree 584aa74649f4b58a9c6e71cb6cf853c5ce761a0c
parent d80e99e2a8bfe9fb12beac38f00f229074c613b4
parent 6ff2d0ce3de74b4830585aec83c2da23fb6e0995

Merge "[fdt] Refactor read_serial_info_from in pvmfw with first_reg()" into main

pvmfw/src/fdt.rs

diff --git a/pvmfw/src/fdt.rs b/pvmfw/src/fdt.rs
index 61de423..1f87dcc 100644
--- a/pvmfw/src/fdt.rs
+++ b/pvmfw/src/fdt.rs
@@ -443,7 +443,7 @@
 fn read_serial_info_from(fdt: &Fdt) -> libfdt::Result<SerialInfo> {
     let mut addrs: ArrayVec<[u64; SerialInfo::MAX_SERIALS]> = Default::default();
     for node in fdt.compatible_nodes(cstr!("ns16550a"))?.take(SerialInfo::MAX_SERIALS) {
-        let reg = node.reg()?.ok_or(FdtError::NotFound)?.next().ok_or(FdtError::NotFound)?;
+        let reg = node.first_reg()?;
         addrs.push(reg.addr);
     }
     Ok(SerialInfo { addrs })