gpu: nova-core: vbios: Fix clippy error in Vbios::new()

[PATCH] gpu: nova-core: vbios: Fix clippy error in Vbios::new()

Posted by Lyude Paul 1 week, 4 days ago

From clippy:

  error: this `if` can be collapsed into the outer `match`
     --> drivers/gpu/nova-core/vbios.rs:328:21
      |
  328 | /                     if pci_at_image.is_none() {
  329 | |                         pci_at_image = Some(PciAtBiosImage::try_from(image)?);
  330 | |                     }
      | |_____________________^
      |

There should be no functional changes in this patch.

Signed-off-by: Lyude Paul <lyude@redhat.com>
---
 drivers/gpu/nova-core/vbios.rs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/nova-core/vbios.rs b/drivers/gpu/nova-core/vbios.rs
index c0bc1008ed752..d38d7f138b49d 100644
--- a/drivers/gpu/nova-core/vbios.rs
+++ b/drivers/gpu/nova-core/vbios.rs
@@ -323,11 +323,9 @@ pub(crate) fn new(dev: &device::Device, bar0: &Bar0) -> Result<Vbios> {
 
             // Convert to a specific image type
             match BiosImageType::try_from(image.pcir.code_type) {
-                Ok(BiosImageType::PciAt) => {
+                Ok(BiosImageType::PciAt) if pci_at_image.is_none() => {
                     // Silently ignore any extra PCI-AT images.
-                    if pci_at_image.is_none() {
-                        pci_at_image = Some(PciAtBiosImage::try_from(image)?);
-                    }
+                    pci_at_image = Some(PciAtBiosImage::try_from(image)?);
                 }
                 Ok(BiosImageType::FwSec) => fwsec_section = Some(image.data),
                 _ => {

base-commit: 2cf1840b0fa7637b6731fd554529f8d57ea34c04
-- 
2.54.0

Re: [PATCH] gpu: nova-core: vbios: Fix clippy error in Vbios::new()

Posted by Alexandre Courbot 1 week, 4 days ago

Hi Lyude,

On Thu May 28, 2026 at 2:15 AM JST, Lyude Paul wrote:
> From clippy:
>
>   error: this `if` can be collapsed into the outer `match`
>      --> drivers/gpu/nova-core/vbios.rs:328:21
>       |
>   328 | /                     if pci_at_image.is_none() {
>   329 | |                         pci_at_image = Some(PciAtBiosImage::try_from(image)?);
>   330 | |                     }
>       | |_____________________^
>       |
>
> There should be no functional changes in this patch.
>
> Signed-off-by: Lyude Paul <lyude@redhat.com>
> ---
>  drivers/gpu/nova-core/vbios.rs | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/nova-core/vbios.rs b/drivers/gpu/nova-core/vbios.rs
> index c0bc1008ed752..d38d7f138b49d 100644
> --- a/drivers/gpu/nova-core/vbios.rs
> +++ b/drivers/gpu/nova-core/vbios.rs
> @@ -323,11 +323,9 @@ pub(crate) fn new(dev: &device::Device, bar0: &Bar0) -> Result<Vbios> {
>  
>              // Convert to a specific image type
>              match BiosImageType::try_from(image.pcir.code_type) {
> -                Ok(BiosImageType::PciAt) => {
> +                Ok(BiosImageType::PciAt) if pci_at_image.is_none() => {
>                      // Silently ignore any extra PCI-AT images.
> -                    if pci_at_image.is_none() {
> -                        pci_at_image = Some(PciAtBiosImage::try_from(image)?);
> -                    }
> +                    pci_at_image = Some(PciAtBiosImage::try_from(image)?);
>                  }
>                  Ok(BiosImageType::FwSec) => fwsec_section = Some(image.data),
>                  _ => {

This lint should disappear once -rc3 reaches `drm-rust-next` per [1].

[1] https://lore.kernel.org/all/CANiq72kR0raSG33DgSxMuc-2uMa626dT=-5=ko_HBgmeOrCFZA@mail.gmail.com/