diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2025-05-13 14:34:54 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2025-05-13 14:34:54 +0200 |
| commit | 0b224fcc89c3b478f6a53e842942080abd7867b3 (patch) | |
| tree | 4e80315e1795db2255a2853df3914b0498faf567 /rust/kernel | |
| parent | f7e9228532beb5c0cbb11101384ed977806ef691 (diff) | |
| parent | 4a6b1cf0d4c02d6da2976c6314c264d20672937e (diff) | |
Merge Energy Model management code changes for 6.16
Diffstat (limited to 'rust/kernel')
| -rw-r--r-- | rust/kernel/firmware.rs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/rust/kernel/firmware.rs b/rust/kernel/firmware.rs index f04b058b09b2..2494c96e105f 100644 --- a/rust/kernel/firmware.rs +++ b/rust/kernel/firmware.rs @@ -4,7 +4,7 @@ //! //! C header: [`include/linux/firmware.h`](srctree/include/linux/firmware.h) -use crate::{bindings, device::Device, error::Error, error::Result, str::CStr}; +use crate::{bindings, device::Device, error::Error, error::Result, ffi, str::CStr}; use core::ptr::NonNull; /// # Invariants @@ -12,7 +12,11 @@ use core::ptr::NonNull; /// One of the following: `bindings::request_firmware`, `bindings::firmware_request_nowarn`, /// `bindings::firmware_request_platform`, `bindings::request_firmware_direct`. struct FwFunc( - unsafe extern "C" fn(*mut *const bindings::firmware, *const u8, *mut bindings::device) -> i32, + unsafe extern "C" fn( + *mut *const bindings::firmware, + *const ffi::c_char, + *mut bindings::device, + ) -> i32, ); impl FwFunc { |