PCI/MSI: Make error path handling follow the standard pattern

Make error path handling follow the standard pattern, i.e.  checking for
errors first. This makes code much easier to read and understand despite
being a bit longer.

Link: https://lore.kernel.org/r/20240426144039.557907-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/pci/msi/msi.c b/drivers/pci/msi/msi.c
index 682fa877478fe9df875c465d2b7d1a92f414aa5a..c5625dd9bf490d5dcb1d5ff17a6badec2e464629 100644 (file)
--- a/drivers/pci/msi/msi.c
+++ b/drivers/pci/msi/msi.c
@@ -86,9 +86,11 @@ static int pcim_setup_msi_release(struct pci_dev *dev)
                return 0;
 
        ret = devm_add_action(&dev->dev, pcim_msi_release, dev);
-       if (!ret)
-               dev->is_msi_managed = true;
-       return ret;
+       if (ret)
+               return ret;
+
+       dev->is_msi_managed = true;
+       return 0;
 }
 
 /*
@@ -99,9 +101,10 @@ static int pci_setup_msi_context(struct pci_dev *dev)
 {
        int ret = msi_setup_device_data(&dev->dev);
 
-       if (!ret)
-               ret = pcim_setup_msi_release(dev);
-       return ret;
+       if (ret)
+               return ret;
+
+       return pcim_setup_msi_release(dev);
 }
 
 /*