mirror of https://github.com/torvalds/linux.git
rust: acpi: use `core::ffi::CStr` method names
Prepare for `core::ffi::CStr` taking the place of `kernel::str::CStr` by avoid methods that only exist on the latter. Signed-off-by: Tamir Duberstein <tamird@gmail.com> Reviewed-by: Benno Lossin <lossin@kernel.org> Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
This commit is contained in:
parent
5749cd1ed8
commit
657403637f
|
|
@ -37,11 +37,8 @@ impl DeviceId {
|
|||
/// Create a new device id from an ACPI 'id' string.
|
||||
#[inline(always)]
|
||||
pub const fn new(id: &'static CStr) -> Self {
|
||||
build_assert!(
|
||||
id.len_with_nul() <= Self::ACPI_ID_LEN,
|
||||
"ID exceeds 16 bytes"
|
||||
);
|
||||
let src = id.as_bytes_with_nul();
|
||||
let src = id.to_bytes_with_nul();
|
||||
build_assert!(src.len() <= Self::ACPI_ID_LEN, "ID exceeds 16 bytes");
|
||||
// Replace with `bindings::acpi_device_id::default()` once stabilized for `const`.
|
||||
// SAFETY: FFI type is valid to be zero-initialized.
|
||||
let mut acpi: bindings::acpi_device_id = unsafe { core::mem::zeroed() };
|
||||
|
|
|
|||
Loading…
Reference in New Issue