[PATCH 3/7] rust: auxiliary: remove the unbind() callback

From: Danilo Krummrich

Date: Wed Nov 11 2026 - 20:06:04 EST


The driver model uses native Rust lifetimes to let driver data retain
device resources and a Device<Bound> reference for the duration of the
binding. Both remain accessible from the destructor, so a separate
unbind() callback is no longer needed.

Remove auxiliary::Driver::unbind() and the adapter's remove callback and
document that device teardown belongs in Drop or PinnedDrop.

Signed-off-by: Danilo Krummrich <dakr@xxxxxxxxxx>
---
rust/kernel/auxiliary.rs | 34 ++++------------------------------
1 file changed, 4 insertions(+), 30 deletions(-)

diff --git a/rust/kernel/auxiliary.rs b/rust/kernel/auxiliary.rs
index 9d3de109b381..d4618c92181f 100644
--- a/rust/kernel/auxiliary.rs
+++ b/rust/kernel/auxiliary.rs
@@ -64,7 +64,6 @@ unsafe fn register(
unsafe {
(*adrv.get()).name = name.as_char_ptr();
(*adrv.get()).probe = Some(Self::probe_callback);
- (*adrv.get()).remove = Some(Self::remove_callback);
(*adrv.get()).id_table = T::ID_TABLE.as_ptr();
}

@@ -105,21 +104,6 @@ extern "C" fn probe_callback(
Ok(0)
})
}
-
- extern "C" fn remove_callback(adev: *mut bindings::auxiliary_device) {
- // SAFETY: The auxiliary bus only ever calls the probe callback with a valid pointer to a
- // `struct auxiliary_device`.
- //
- // INVARIANT: `adev` is valid for the duration of `remove_callback()`.
- let adev = unsafe { &*adev.cast::<Device<device::CoreInternal<'_>>>() };
-
- // SAFETY: `remove_callback` is only ever called after a successful call to
- // `probe_callback`, hence it's guaranteed that `Device::set_drvdata()` has been called
- // and stored a `Pin<KBox<T::Data<'_>>>`.
- let data = unsafe { adev.as_ref().drvdata_borrow::<T::Data<'_>>() };
-
- T::unbind(adev, data);
- }
}

/// Declares a kernel module that exposes a single auxiliary driver.
@@ -205,6 +189,10 @@ pub trait Driver {
type IdInfo: 'static;

/// The type of the driver's bus device private data.
+ ///
+ /// Device teardown should be performed in [`Drop`] or [`PinnedDrop`](pin_init::PinnedDrop)
+ /// for this type. The `'bound` lifetime allows the data to retain device resources and a
+ /// [`Device<device::Bound>`] reference for use during teardown.
type Data<'bound>: Send + 'bound;

/// The table of device ids supported by the driver.
@@ -217,20 +205,6 @@ fn probe<'bound>(
dev: &'bound Device<device::Core<'_>>,
id_info: &'bound Self::IdInfo,
) -> impl PinInit<Self::Data<'bound>, Error> + 'bound;
-
- /// Auxiliary driver unbind.
- ///
- /// Called when a [`Device`] is unbound from its bound [`Driver`]. Implementing this callback
- /// is optional.
- ///
- /// This callback serves as a place for drivers to perform teardown operations that require a
- /// `&Device<Core>` or `&Device<Bound>` reference. For instance, drivers may try to perform I/O
- /// operations to gracefully tear down the device.
- ///
- /// Otherwise, release operations for driver resources should be performed in `Drop`.
- fn unbind<'bound>(dev: &'bound Device<device::Core<'_>>, this: Pin<&Self::Data<'bound>>) {
- let _ = (dev, this);
- }
}

/// The auxiliary device representation.
--
2.56.0