diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2025-07-21 12:40:56 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2025-07-21 12:40:56 +0200 |
| commit | 1c61cf974917bc47930bdab4ec9a18ec8fe7ac77 (patch) | |
| tree | 0ac66163d0138ea4875c8454ada9fa7851febefc | |
| parent | e04c78d86a9699d136910cfc0bdcf01087e3267e (diff) | |
| parent | 22679d807dea5c065d8019acfce48f20e87ba5ca (diff) | |
Merge tag 'opp-updates-6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm
Merge an operating performance points (OPP) update for 6.17 from Viresh
Kumar:
"- Minor cleanup in Rust bindings (Abhinav Ananthu)."
* tag 'opp-updates-6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm:
rust: opp: use c_* types via kernel prelude
| -rw-r--r-- | rust/kernel/opp.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/rust/kernel/opp.rs b/rust/kernel/opp.rs index a566fc3e7dcb..846583da9a2f 100644 --- a/rust/kernel/opp.rs +++ b/rust/kernel/opp.rs @@ -514,9 +514,9 @@ impl<T: ConfigOps + Default> Config<T> { dev: *mut bindings::device, opp_table: *mut bindings::opp_table, opp: *mut bindings::dev_pm_opp, - _data: *mut kernel::ffi::c_void, + _data: *mut c_void, scaling_down: bool, - ) -> kernel::ffi::c_int { + ) -> c_int { from_result(|| { // SAFETY: 'dev' is guaranteed by the C code to be valid. let dev = unsafe { Device::get_device(dev) }; @@ -540,8 +540,8 @@ impl<T: ConfigOps + Default> Config<T> { old_opp: *mut bindings::dev_pm_opp, new_opp: *mut bindings::dev_pm_opp, regulators: *mut *mut bindings::regulator, - count: kernel::ffi::c_uint, - ) -> kernel::ffi::c_int { + count: c_uint, + ) -> c_int { from_result(|| { // SAFETY: 'dev' is guaranteed by the C code to be valid. let dev = unsafe { Device::get_device(dev) }; |