Re: [PATCH] rust: cast to the proper type
From: Alice Ryhl
Date: Mon Jun 23 2025 - 07:39:55 EST
On Wed, Jun 11, 2025 at 06:28:47AM -0400, Tamir Duberstein wrote:
> Use the ffi type rather than the resolved underlying type.
>
> Fixes: f20fd5449ada ("rust: core abstractions for network PHY drivers")
> Signed-off-by: Tamir Duberstein <tamird@xxxxxxxxx>
Please use unqualified imports.
> rust/kernel/net/phy.rs | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/rust/kernel/net/phy.rs b/rust/kernel/net/phy.rs
> index 32ea43ece646..905e6534c083 100644
> --- a/rust/kernel/net/phy.rs
> +++ b/rust/kernel/net/phy.rs
> @@ -163,17 +163,17 @@ pub fn set_speed(&mut self, speed: u32) {
> let phydev = self.0.get();
> // SAFETY: The struct invariant ensures that we may access
> // this field without additional synchronization.
> - unsafe { (*phydev).speed = speed as i32 };
> + unsafe { (*phydev).speed = speed as crate::ffi::c_int };
unsafe { (*phydev).speed = speed as c_int };
> }
>
> /// Sets duplex mode.
> pub fn set_duplex(&mut self, mode: DuplexMode) {
> let phydev = self.0.get();
> let v = match mode {
> - DuplexMode::Full => bindings::DUPLEX_FULL as i32,
> - DuplexMode::Half => bindings::DUPLEX_HALF as i32,
> - DuplexMode::Unknown => bindings::DUPLEX_UNKNOWN as i32,
> - };
> + DuplexMode::Full => bindings::DUPLEX_FULL,
> + DuplexMode::Half => bindings::DUPLEX_HALF,
> + DuplexMode::Unknown => bindings::DUPLEX_UNKNOWN,
> + } as crate::ffi::c_int;
I would keep the imports on each line.
let v = match mode {
DuplexMode::Full => bindings::DUPLEX_FULL as c_int,
DuplexMode::Half => bindings::DUPLEX_HALF as c_int,
DuplexMode::Unknown => bindings::DUPLEX_UNKNOWN as c_int,
};
Alice
> // SAFETY: The struct invariant ensures that we may access
> // this field without additional synchronization.
> unsafe { (*phydev).duplex = v };
>
> ---
> base-commit: 19272b37aa4f83ca52bdf9c16d5d81bdd1354494
> change-id: 20250611-correct-type-cast-1de8876ddfc1
>
> Best regards,
> --
> Tamir Duberstein <tamird@xxxxxxxxx>
>