diff options
| author | Onur Özkan <work@onurozkan.dev> | 2025-06-18 12:35:08 +0300 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2025-06-19 12:42:38 -0700 |
| commit | b112dfc74b2040721959935b317d784455c5f635 (patch) | |
| tree | 6559552578d6251339474d6e0f7f31aded5b1984 /rust/kernel | |
| parent | bbbaea850e52c408654a586e0c4fbff8c1efc6f1 (diff) | |
rust: shorten `con_id`s in `get` methods in clk module
Converts `if-else` blocks into one line code using `map_or`
for simplicity.
Signed-off-by: Onur Özkan <work@onurozkan.dev>
Link: https://lore.kernel.org/r/20250618093508.16343-1-work@onurozkan.dev
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Alexandre Courbot <acourbot@nvidia.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Diffstat (limited to 'rust/kernel')
| -rw-r--r-- | rust/kernel/clk.rs | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/rust/kernel/clk.rs b/rust/kernel/clk.rs index ef0a2edd52c3..d5b1112102e1 100644 --- a/rust/kernel/clk.rs +++ b/rust/kernel/clk.rs @@ -132,11 +132,7 @@ mod common_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 @@ mod common_clk { /// [`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. // |