fixup! iio: common: Add AOP sensor drivers.

switch to platform::Device

Signed-off-by: Janne Grunau <[email protected]>

Author: jannau

drivers/iio/common/aop_sensors/aop_als.rs

@@ -5,30 +5,28 @@
 //! Copyright (C) The Asahi Linux Contributors
 
 use kernel::{
-    bindings, c_str, device,
+    bindings, c_str,
     iio::common::aop_sensors::{AopSensorData, IIORegistration, MessageProcessor},
     module_platform_driver,
     of::{self, Node},
     platform,
     prelude::*,
     soc::apple::aop::{EPICService, AOP},
     sync::Arc,
-    types::{ARef, ForeignOwnable},
+    types::ForeignOwnable,
 };
 
 const EPIC_SUBTYPE_SET_ALS_PROPERTY: u16 = 0x4;
 
-fn enable_als(
-    aop: &dyn AOP,
-    dev: &ARef<device::Device>,
-    of: &Node,
-    svc: &EPICService,
-) -> Result<()> {
+fn enable_als(aop: &dyn AOP, dev: &platform::Device, of: &Node, svc: &EPICService) -> Result<()> {
     if let Some(prop) = of.find_property(c_str!("apple,als-calibration")) {
         set_als_property(aop, svc, 0xb, prop.value())?;
         set_als_property(aop, svc, 0, &200000u32.to_le_bytes())?;
     } else {
-        dev_warn!(dev, "ALS Calibration not found, will not enable it");
+        dev_warn!(
+            dev.as_ref(),
+            "ALS Calibration not found, will not enable it"
+        );
     }
     Ok(())
 }
@@ -85,7 +83,7 @@ impl platform::Driver for IIOAopAlsDriver {
         pdev: &mut platform::Device,
         _info: Option<&()>,
     ) -> Result<Pin<KBox<IIOAopAlsDriver>>> {
-        let dev = pdev.get_device();
+        let dev = pdev.as_ref();
         let parent = dev.parent().unwrap();
         // SAFETY: our parent is AOP, and AopDriver is repr(transparent) for Arc<dyn Aop>
         let adata_ptr = unsafe { Pin::<KBox<Arc<dyn AOP>>>::borrow(parent.get_drvdata()) };
@@ -98,9 +96,9 @@ impl platform::Driver for IIOAopAlsDriver {
             .get_child_by_name(c_str!("als"))
             .ok_or(EIO)?;
         let ty = bindings::BINDINGS_IIO_LIGHT;
-        let data = AopSensorData::new(dev.clone(), ty, MsgProc(40))?;
+        let data = AopSensorData::new(pdev.clone(), ty, MsgProc(40))?;
         adata.add_fakehid_listener(service, data.clone())?;
-        enable_als(adata.as_ref(), &dev, &of, &service)?;
+        enable_als(adata.as_ref(), pdev, &of, &service)?;
         let info_mask = 1 << bindings::BINDINGS_IIO_CHAN_INFO_PROCESSED;
         Ok(KBox::pin(
             IIOAopAlsDriver(IIORegistration::<MsgProc>::new(

drivers/iio/common/aop_sensors/aop_las.rs

@@ -36,7 +36,7 @@ impl platform::Driver for IIOAopLasDriver {
         pdev: &mut platform::Device,
         _info: Option<&()>,
     ) -> Result<Pin<KBox<IIOAopLasDriver>>> {
-        let dev = pdev.get_device();
+        let dev = pdev.as_ref();
         let parent = dev.parent().unwrap();
         // SAFETY: our parent is AOP, and AopDriver is repr(transparent) for Arc<dyn Aop>
         let adata_ptr = unsafe { Pin::<KBox<Arc<dyn AOP>>>::borrow(parent.get_drvdata()) };
@@ -45,7 +45,7 @@ impl platform::Driver for IIOAopLasDriver {
         let service = unsafe { *((*dev.as_raw()).platform_data as *const EPICService) };
 
         let ty = bindings::BINDINGS_IIO_ANGL;
-        let data = AopSensorData::new(dev, ty, MsgProc)?;
+        let data = AopSensorData::new(pdev.clone(), ty, MsgProc)?;
         adata.add_fakehid_listener(service, data.clone())?;
         let info_mask = 1 << bindings::BINDINGS_IIO_CHAN_INFO_RAW;
         Ok(KBox::pin(

rust/kernel/iio/common/aop_sensors.rs

@@ -9,30 +9,26 @@ use core::ptr;
 use core::sync::atomic::{AtomicU32, Ordering};
 
 use kernel::{
-    bindings, device,
-    prelude::*,
-    soc::apple::aop::FakehidListener,
-    sync::Arc,
-    types::{ARef, ForeignOwnable},
-    ThisModule,
+    bindings, platform, prelude::*, soc::apple::aop::FakehidListener, sync::Arc,
+    types::ForeignOwnable, ThisModule,
 };
 
 pub trait MessageProcessor {
     fn process(&self, message: &[u8]) -> u32;
 }
 
 pub struct AopSensorData<T: MessageProcessor> {
-    dev: ARef<device::Device>,
+    dev: platform::Device,
     ty: u32,
     value: AtomicU32,
     msg_proc: T,
 }
 
 impl<T: MessageProcessor> AopSensorData<T> {
-    pub fn new(dev: ARef<device::Device>, ty: u32, msg_proc: T) -> Result<Arc<AopSensorData<T>>> {
+    pub fn new(dev: platform::Device, ty: u32, msg_proc: T) -> Result<Arc<AopSensorData<T>>> {
         Ok(Arc::new(
             AopSensorData {
-                dev: dev.clone(),
+                dev,
                 ty,
                 value: AtomicU32::new(0),
                 msg_proc,
@@ -124,7 +120,7 @@ impl<T: MessageProcessor + 'static> IIORegistration<T> {
             registered: false,
             _p: PhantomData,
         };
-        this.dev = unsafe { bindings::iio_device_alloc(data.dev.as_raw(), 0) };
+        this.dev = unsafe { bindings::iio_device_alloc(data.dev.as_ref().as_raw(), 0) };
         unsafe {
             (*this.dev).priv_ = data.clone().into_foreign() as _;
             (*this.dev).name = name.as_ptr() as _;
@@ -135,7 +131,7 @@ impl<T: MessageProcessor + 'static> IIORegistration<T> {
         }
         let ret = unsafe { bindings::__iio_device_register(this.dev, module.as_ptr()) };
         if ret < 0 {
-            dev_err!(data.dev, "Unable to register iio sensor");
+            dev_err!(data.dev.as_ref(), "Unable to register iio sensor");
             return Err(Error::from_errno(ret));
         }
         this.registered = true;