Skip to content

Commit b112dfc

Browse files
onur-ozkanbebarino
authored andcommitted
rust: shorten con_ids 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>
1 parent bbbaea8 commit b112dfc

1 file changed

Lines changed: 2 additions & 10 deletions

File tree

rust/kernel/clk.rs

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,7 @@ mod common_clk {
132132
///
133133
/// [`clk_get`]: https://docs.kernel.org/core-api/kernel-api.html#c.clk_get
134134
pub fn get(dev: &Device, name: Option<&CStr>) -> Result<Self> {
135-
let con_id = if let Some(name) = name {
136-
name.as_ptr()
137-
} else {
138-
ptr::null()
139-
};
135+
let con_id = name.map_or(ptr::null(), |n| n.as_ptr());
140136

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

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

0 commit comments

Comments
 (0)