Improve readability by moving the success path outside of a nested
branch.
Reviewed-by: John Hubbard <[email protected]>
Signed-off-by: Eliot Courtney <[email protected]>
---
drivers/gpu/nova-core/vbios.rs | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/nova-core/vbios.rs b/drivers/gpu/nova-core/vbios.rs
index 5266e15793cf..52e33fdd4f5d 100644
--- a/drivers/gpu/nova-core/vbios.rs
+++ b/drivers/gpu/nova-core/vbios.rs
@@ -352,18 +352,18 @@ 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(pci_at), Some(fwsec_section)) = (pci_at_image,
fwsec_section) {
- let fwsec_image = FwSecBiosImage::new(dev, pci_at, fwsec_section)
- .inspect_err(|e| dev_err!(dev, "Falcon data setup failed:
{:?}\n", e))?;
-
- Ok(Vbios { fwsec_image })
- } else {
+ let (Some(pci_at), Some(fwsec_section)) = (pci_at_image,
fwsec_section) else {
dev_err!(
dev,
"Missing required images for falcon data setup, skipping\n"
);
- Err(EINVAL)
- }
+ return Err(EINVAL);
+ };
+
+ let fwsec_image = FwSecBiosImage::new(dev, pci_at, fwsec_section)
+ .inspect_err(|e| dev_err!(dev, "Falcon data setup failed: {:?}\n",
e))?;
+
+ Ok(Vbios { fwsec_image })
}
pub(crate) fn fwsec_image(&self) -> &FwSecBiosImage {
--
2.54.0