Skip to content

Commit 1c61cf9

Browse files
committed
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
2 parents e04c78d + 22679d8 commit 1c61cf9

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

rust/kernel/opp.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -514,9 +514,9 @@ impl<T: ConfigOps + Default> Config<T> {
514514
dev: *mut bindings::device,
515515
opp_table: *mut bindings::opp_table,
516516
opp: *mut bindings::dev_pm_opp,
517-
_data: *mut kernel::ffi::c_void,
517+
_data: *mut c_void,
518518
scaling_down: bool,
519-
) -> kernel::ffi::c_int {
519+
) -> c_int {
520520
from_result(|| {
521521
// SAFETY: 'dev' is guaranteed by the C code to be valid.
522522
let dev = unsafe { Device::get_device(dev) };
@@ -540,8 +540,8 @@ impl<T: ConfigOps + Default> Config<T> {
540540
old_opp: *mut bindings::dev_pm_opp,
541541
new_opp: *mut bindings::dev_pm_opp,
542542
regulators: *mut *mut bindings::regulator,
543-
count: kernel::ffi::c_uint,
544-
) -> kernel::ffi::c_int {
543+
count: c_uint,
544+
) -> c_int {
545545
from_result(|| {
546546
// SAFETY: 'dev' is guaranteed by the C code to be valid.
547547
let dev = unsafe { Device::get_device(dev) };

0 commit comments

Comments
 (0)