diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2024-04-26 16:40:39 +0200 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2024-04-27 00:04:20 +0200 |
| commit | 0ba5cd94bbc2d21ffb392b6a3b23ee288b4778d5 (patch) | |
| tree | 5d7786ff606c1419d24565036be968bb78f4a5e4 /drivers/pci/msi | |
| parent | Linux 6.9-rc1 (diff) | |
| download | linux-0ba5cd94bbc2d21ffb392b6a3b23ee288b4778d5.tar.xz linux-0ba5cd94bbc2d21ffb392b6a3b23ee288b4778d5.zip | |
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>
Diffstat (limited to 'drivers/pci/msi')
| -rw-r--r-- | drivers/pci/msi/msi.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/pci/msi/msi.c b/drivers/pci/msi/msi.c index 682fa877478f..c5625dd9bf49 100644 --- 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); } /* |