mirror of
https://github.com/torvalds/linux.git
synced 2026-04-21 00:04:01 -04:00
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>
This commit is contained in:
@@ -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.
|
||||
//
|
||||
|
||||
Reference in New Issue
Block a user