diff options
author | FUJITA Tomonori <fujita.tomonori@gmail.com> | 2025-07-11 13:09:45 +0900 |
---|---|---|
committer | Danilo Krummrich <dakr@kernel.org> | 2025-07-16 23:38:21 +0200 |
commit | 8d84b32075fb2d9bd95c7e47b165942411d74bba (patch) | |
tree | da3d2d0e94c1d9cd52bf8f3f62a709c2b07ba180 /rust/kernel/driver.rs | |
parent | 2f5606afa4c2bcabd45cb34c92faf93ca5ffe75e (diff) |
rust: device_id: split out index support into a separate trait
Introduce a new trait `RawDeviceIdIndex`, which extends `RawDeviceId`
to provide support for device ID types that include an index or
context field (e.g., `driver_data`). This separates the concerns of
layout compatibility and index-based data embedding, and allows
`RawDeviceId` to be implemented for types that do not contain a
`driver_data` field. Several such structures are defined in
include/linux/mod_devicetable.h.
Refactor `IdArray::new()` into a generic `build()` function, which
takes an optional offset. Based on the presence of `RawDeviceIdIndex`,
index writing is conditionally enabled. A new `new_without_index()`
constructor is also provided for use cases where no index should be
written.
This refactoring is a preparation for enabling the PHY abstractions to
use the RawDeviceId trait.
The changes to acpi.rs and driver.rs were made by Danilo.
Reviewed-by: Trevor Gross <tmgross@umich.edu>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@gmail.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lore.kernel.org/r/20250711040947.1252162-2-fujita.tomonori@gmail.com
Signed-off-by: Danilo Krummrich <dakr@kernel.org>
Diffstat (limited to 'rust/kernel/driver.rs')
-rw-r--r-- | rust/kernel/driver.rs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/rust/kernel/driver.rs b/rust/kernel/driver.rs index f8dd7593e8dc..a8f2675ba7a7 100644 --- a/rust/kernel/driver.rs +++ b/rust/kernel/driver.rs @@ -170,7 +170,7 @@ pub trait Adapter { // and does not add additional invariants, so it's safe to transmute. let id = unsafe { &*raw_id.cast::<acpi::DeviceId>() }; - Some(table.info(<acpi::DeviceId as crate::device_id::RawDeviceId>::index(id))) + Some(table.info(<acpi::DeviceId as crate::device_id::RawDeviceIdIndex>::index(id))) } } } @@ -204,7 +204,11 @@ pub trait Adapter { // and does not add additional invariants, so it's safe to transmute. let id = unsafe { &*raw_id.cast::<of::DeviceId>() }; - Some(table.info(<of::DeviceId as crate::device_id::RawDeviceId>::index(id))) + Some( + table.info(<of::DeviceId as crate::device_id::RawDeviceIdIndex>::index( + id, + )), + ) } } } |