Re: [PATCH v4 16/20] gpu: nova-core: vbios: use let-else in Vbios::new

[John Hubbard <jhubbard@nvidia.com>]

On 5/18/26 7:55 PM, Eliot Courtney wrote:
> Improve readability by moving the success path outside of a nested
> branch.
> 
> Signed-off-by: Eliot Courtney <ecourtney@nvidia.com>
> ---
>  drivers/gpu/nova-core/vbios.rs | 36 ++++++++++++++++++------------------
>  1 file changed, 18 insertions(+), 18 deletions(-)

Reviewed-by: John Hubbard <jhubbard@nvidia.com>

thanks,
-- 
John Hubbard

> 
> diff --git a/drivers/gpu/nova-core/vbios.rs b/drivers/gpu/nova-core/vbios.rs
> index ff21f85fdfb6..64d100b6699b 100644
> --- a/drivers/gpu/nova-core/vbios.rs
> +++ b/drivers/gpu/nova-core/vbios.rs
> @@ -353,30 +353,30 @@ pub(crate) fn new(dev: &device::Device, bar0: &Bar0) -> Result<Vbios> {
>          }
>  
>          // Using all the images, setup the falcon data pointer in Fwsec.
> -        if let (Some(second), Some(first), Some(pci_at)) =
> +        let (Some(second), Some(first), Some(pci_at)) =
>              (second_fwsec_image, first_fwsec_image, pci_at_image)
> -        {
> -            let fwsec_image = FwSecBiosImage::new(pci_at, first, second)
> -                .inspect_err(|e| dev_err!(dev, "Falcon data setup failed: {:?}\n", e))?;
> -
> -            if cfg!(debug_assertions) {
> -                // Print the desc header for debugging
> -                let desc = fwsec_image.header()?;
> -                dev_dbg!(
> -                    fwsec_image.base.dev,
> -                    "PmuLookupTableEntry desc: {:#?}\n",
> -                    desc
> -                );
> -            }
> -
> -            Ok(Vbios { fwsec_image })
> -        } else {
> +        else {
>              dev_err!(
>                  dev,
>                  "Missing required images for falcon data setup, skipping\n"
>              );
> -            Err(EINVAL)
> +            return Err(EINVAL);
> +        };
> +
> +        let fwsec_image = FwSecBiosImage::new(pci_at, first, second)
> +            .inspect_err(|e| dev_err!(dev, "Falcon data setup failed: {:?}\n", e))?;
> +
> +        if cfg!(debug_assertions) {
> +            // Print the desc header for debugging
> +            let desc = fwsec_image.header()?;
> +            dev_dbg!(
> +                fwsec_image.base.dev,
> +                "PmuLookupTableEntry desc: {:#?}\n",
> +                desc
> +            );
>          }
> +
> +        Ok(Vbios { fwsec_image })
>      }
>  
>      pub(crate) fn fwsec_image(&self) -> &FwSecBiosImage {
>