fixup! rust: of: Add OF node abstraction

Author: jannau

rust/helpers/helpers.c

@@ -18,6 +18,7 @@
 #include "kunit.c"
 #include "lockdep.c"
 #include "mutex.c"
+#include "of.c"
 #include "page.c"
 #include "platform.c"
 #include "pci.c"

rust/kernel/device.rs

@@ -5,7 +5,7 @@
 //! C header: [`include/linux/device.h`](srctree/include/linux/device.h)
 
 use crate::{
-    bindings,
+    bindings, of,
     types::{ARef, Opaque},
 };
 use core::{fmt, ptr};
@@ -77,6 +77,13 @@ impl Device {
         unsafe { &*ptr.cast() }
     }
 
+    /// Gets the OpenFirmware node attached to this device
+    pub fn of_node(&self) -> Option<of::Node> {
+        let ptr = self.0.get();
+        // SAFETY: This is safe as long as of_node is NULL or valid.
+        unsafe { of::Node::get_from_raw((*ptr).of_node) }
+    }
+
     /// Prints an emergency-level message (level 0) prefixed with device information.
     ///
     /// More details are available from [`dev_emerg`].

rust/kernel/of.rs

@@ -10,15 +10,8 @@ use crate::{bindings, device_id::RawDeviceId, prelude::*};
 // here for now. In the future, once bindgen can auto-generate static inline
 // helpers, this can go away if desired.
 
-//use core::marker::PhantomData;
-//use core::num::NonZeroU32;
-
-//use crate::{
-//    alloc::flags::*,
-//    bindings, driver,
-//    prelude::*,
-//    str::{BStr, CStr},
-//};
+use core::marker::PhantomData;
+use core::num::NonZeroU32;
 
 /// An open firmware device id.
 #[derive(Clone, Copy)]
@@ -339,10 +332,10 @@ pub trait PropertyUnit: Sized {
 //     }
 // }
 
-impl<'a, T: PropertyUnit> TryFrom<Property<'a>> for Vec<T> {
+impl<'a, T: PropertyUnit> TryFrom<Property<'a>> for KVec<T> {
     type Error = Error;
 
-    fn try_from(p: Property<'_>) -> core::result::Result<Vec<T>, Self::Error> {
+    fn try_from(p: Property<'_>) -> core::result::Result<KVec<T>, Self::Error> {
         if p.len() % T::UNIT_SIZE != 0 {
             return Err(EINVAL);
         }