[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <2026011725-contour-salary-d3d1@gregkh>
Date: Sat, 17 Jan 2026 11:00:11 +0100
From: Greg KH <gregkh@...uxfoundation.org>
To: Onur Özkan <work@...rozkan.dev>
Cc: rust-for-linux@...r.kernel.org, rafael@...nel.org, dakr@...nel.org,
ojeda@...nel.org, boqun.feng@...il.com, gary@...yguo.net,
bjorn3_gh@...tonmail.com, lossin@...nel.org, a.hindborg@...nel.org,
aliceryhl@...gle.com, tmgross@...ch.edu,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH v2 1/1] rust: simplify `Adapter::id_info`
On Sat, Jan 17, 2026 at 12:47:10PM +0300, Onur Özkan wrote:
> id_info() checks ACPI first and falls back to OF.
>
> This replaces the unnecessarily verbose approach with a
> simple or_else() chain and drops temporary variables.
>
> No functional change intended.
>
> Signed-off-by: Onur Özkan <work@...rozkan.dev>
> ---
> rust/kernel/driver.rs | 12 +-----------
> 1 file changed, 1 insertion(+), 11 deletions(-)
>
> diff --git a/rust/kernel/driver.rs b/rust/kernel/driver.rs
> index 649d06468f41..6cef792d54e4 100644
> --- a/rust/kernel/driver.rs
> +++ b/rust/kernel/driver.rs
> @@ -307,16 +307,6 @@ fn of_id_info(dev: &device::Device) -> Option<&'static Self::IdInfo> {
> /// If this returns `None`, it means that there is no match in any of the ID tables directly
> /// associated with a [`device::Device`].
> fn id_info(dev: &device::Device) -> Option<&'static Self::IdInfo> {
> - let id = Self::acpi_id_info(dev);
> - if id.is_some() {
> - return id;
> - }
> -
> - let id = Self::of_id_info(dev);
> - if id.is_some() {
> - return id;
> - }
> -
> - None
> + Self::acpi_id_info(dev).or_else(|| Self::of_id_info(dev))
Have we already started the game of "rust golf" on the kernel? The
original code here is much easier to read, and the compiler should
produce the same thing for both, right?
thanks,
greg k-h
Powered by blists - more mailing lists