[PATCH] rust: shorten `con_id`s in `get` methods in clk module

[PATCH] rust: shorten `con_id`s in `get` methods in clk module

[Onur Özkan]

Converts `if-else` blocks into one line code using `map_or`
for simplicity.

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

diff --git a/rust/kernel/clk.rs b/rust/kernel/clk.rs
index 6041c6d07527..b09f295addce 100644
--- a/rust/kernel/clk.rs
+++ b/rust/kernel/clk.rs
@@ -132,11 +132,7 @@ impl Clk {
         ///
         /// [`clk_get`]: https://docs.kernel.org/core-api/kernel-api.html#c.clk_get
         pub fn get(dev: &Device, name: Option<&CStr>) -> Result<Self> {
-            let con_id = if let Some(name) = name {
-                name.as_ptr()
-            } else {
-                ptr::null()
-            };
+            let con_id = name.map_or(ptr::null(), |n| n.as_ptr());

             // SAFETY: It is safe to call [`clk_get`] for a valid device pointer.
             //
@@ -304,11 +300,7 @@ impl OptionalClk {
         /// [`clk_get_optional`]:
         /// https://docs.kernel.org/core-api/kernel-api.html#c.clk_get_optional
         pub fn get(dev: &Device, name: Option<&CStr>) -> Result<Self> {
-            let con_id = if let Some(name) = name {
-                name.as_ptr()
-            } else {
-                ptr::null()
-            };
+            let con_id = name.map_or(ptr::null(), |n| n.as_ptr());

             // SAFETY: It is safe to call [`clk_get_optional`] for a valid device pointer.
             //
2.49.0

Re: [PATCH] rust: shorten `con_id`s in `get` methods in clk module

[Viresh Kumar]

On Wed, Jun 18, 2025 at 3:07 PM Onur Özkan <work@onurozkan.dev> wrote:
>
> Converts `if-else` blocks into one line code using `map_or`
> for simplicity.
>
> Signed-off-by: Onur Özkan <work@onurozkan.dev>
> ---
>  rust/kernel/clk.rs | 12 ++----------
>  1 file changed, 2 insertions(+), 10 deletions(-)

Acked-by: Viresh Kumar <viresh.kumar@linaro.org>

Re: [PATCH] rust: shorten `con_id`s in `get` methods in clk module

[Alexandre Courbot]

On Wed Jun 18, 2025 at 6:35 PM JST, Onur Özkan wrote:
> Converts `if-else` blocks into one line code using `map_or`
> for simplicity.
>
> Signed-off-by: Onur Özkan <work@onurozkan.dev>

FWIW,

Reviewed-by: Alexandre Courbot <acourbot@nvidia.com>

Re: [PATCH] rust: shorten `con_id`s in `get` methods in clk module

[Stephen Boyd]

Quoting Onur Özkan (2025-06-18 02:35:08)
> Converts `if-else` blocks into one line code using `map_or`
> for simplicity.
> 
> Signed-off-by: Onur Özkan <work@onurozkan.dev>
> ---

Applied to clk-next