rust: phy: use to_result for error handling

[PATCH] rust: phy: use to_result for error handling

Posted by Onur Özkan 1 month, 1 week ago

Simplifies error handling by replacing the manual check
of the return value with the `to_result` helper.

Signed-off-by: Onur Özkan <work@onurozkan.dev>
---
 rust/kernel/net/phy.rs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/rust/kernel/net/phy.rs b/rust/kernel/net/phy.rs
index 7de5cc7a0eee..c895582cd624 100644
--- a/rust/kernel/net/phy.rs
+++ b/rust/kernel/net/phy.rs
@@ -196,11 +196,8 @@ pub fn read_paged(&mut self, page: u16, regnum: u16) -> Result<u16> {
         // SAFETY: `phydev` is pointing to a valid object by the type invariant of `Self`.
         // So it's just an FFI call.
         let ret = unsafe { bindings::phy_read_paged(phydev, page.into(), regnum.into()) };
-        if ret < 0 {
-            Err(Error::from_errno(ret))
-        } else {
-            Ok(ret as u16)
-        }
+
+        to_result(ret).map(|()| ret as u16)
     }

     /// Resolves the advertisements into PHY settings.
--
2.50.0

Re: [PATCH] rust: phy: use to_result for error handling

Posted by Trevor Gross 1 month ago

On Thu Aug 21, 2025 at 4:12 AM CDT, Onur Özkan wrote:
> Simplifies error handling by replacing the manual check
> of the return value with the `to_result` helper.
>
> Signed-off-by: Onur Özkan <work@onurozkan.dev>

Reviewed-by: Trevor Gross <tmgross@umich.edu>

> ---
>  rust/kernel/net/phy.rs | 7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/rust/kernel/net/phy.rs b/rust/kernel/net/phy.rs
> index 7de5cc7a0eee..c895582cd624 100644
> --- a/rust/kernel/net/phy.rs
> +++ b/rust/kernel/net/phy.rs
> @@ -196,11 +196,8 @@ pub fn read_paged(&mut self, page: u16, regnum: u16) -> Result<u16> {
>          // SAFETY: `phydev` is pointing to a valid object by the type invariant of `Self`.
>          // So it's just an FFI call.
>          let ret = unsafe { bindings::phy_read_paged(phydev, page.into(), regnum.into()) };
> -        if ret < 0 {
> -            Err(Error::from_errno(ret))
> -        } else {
> -            Ok(ret as u16)
> -        }
> +
> +        to_result(ret).map(|()| ret as u16)
>      }
>
>      /// Resolves the advertisements into PHY settings.
> --
> 2.50.0

Re: [PATCH] rust: phy: use to_result for error handling

Posted by Elle Rhumsaa 1 month, 1 week ago

On Thu, Aug 21, 2025 at 12:12:35PM +0300, Onur Özkan wrote:
> Simplifies error handling by replacing the manual check
> of the return value with the `to_result` helper.
> 
> Signed-off-by: Onur Özkan <work@onurozkan.dev>
> ---
>  rust/kernel/net/phy.rs | 7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/rust/kernel/net/phy.rs b/rust/kernel/net/phy.rs
> index 7de5cc7a0eee..c895582cd624 100644
> --- a/rust/kernel/net/phy.rs
> +++ b/rust/kernel/net/phy.rs
> @@ -196,11 +196,8 @@ pub fn read_paged(&mut self, page: u16, regnum: u16) -> Result<u16> {
>          // SAFETY: `phydev` is pointing to a valid object by the type invariant of `Self`.
>          // So it's just an FFI call.
>          let ret = unsafe { bindings::phy_read_paged(phydev, page.into(), regnum.into()) };
> -        if ret < 0 {
> -            Err(Error::from_errno(ret))
> -        } else {
> -            Ok(ret as u16)
> -        }
> +
> +        to_result(ret).map(|()| ret as u16)
>      }
> 
>      /// Resolves the advertisements into PHY settings.
> --
> 2.50.0

Reviewed-by: Elle Rhumsaa <elle@weathered-steel.dev>