* [PATCH] gpu: nova-core: vbios: Fix clippy error in Vbios::new()
@ 2026-05-27 17:15 Lyude Paul
2026-05-28 1:12 ` Alexandre Courbot
0 siblings, 1 reply; 2+ messages in thread
From: Lyude Paul @ 2026-05-27 17:15 UTC (permalink / raw)
To: dri-devel, nova-gpu
Cc: Alexandre Courbot, linux-kernel, Simona Vetter, Alice Ryhl,
David Airlie, Danilo Krummrich, Lyude Paul
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
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] gpu: nova-core: vbios: Fix clippy error in Vbios::new()
2026-05-27 17:15 [PATCH] gpu: nova-core: vbios: Fix clippy error in Vbios::new() Lyude Paul
@ 2026-05-28 1:12 ` Alexandre Courbot
0 siblings, 0 replies; 2+ messages in thread
From: Alexandre Courbot @ 2026-05-28 1:12 UTC (permalink / raw)
To: Lyude Paul
Cc: dri-devel, nova-gpu, linux-kernel, Simona Vetter, Alice Ryhl,
David Airlie, Danilo Krummrich
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/
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-05-28 1:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-05-27 17:15 [PATCH] gpu: nova-core: vbios: Fix clippy error in Vbios::new() Lyude Paul
2026-05-28 1:12 ` Alexandre Courbot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox