PCI/MSI: Make error path handling follow the standard pattern
PATCH 1/1 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 more easier to read and understand despite being a bit longer.
Signed-off-by Andy Shevchenko <[email protected]>
--- drivers/pci/msi/msi.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
drivers/pci/msi/msi.c +9 -6
@@ -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); }/*
Signature · 1 line
2.43.0.rc1.1336.g36b5255a03ac
Bjorn Helgaas
AppliedQuoted 5 lines · Andy Shevchenko
Make error path handling follow the standard pattern, i.e. checking for errors first. This makes code much more easier to read and understand despite being a bit longer.
Signed-off-by Andy Shevchenko <[email protected]>
Applied to pci/msi for v6.10, thanks!
I like this style much better too.
Quoted 40 lines
--- drivers/pci/msi/msi.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)drivers/pci/msi/msi.c +9
-6@@ -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); }/* Signature · 1 line
2.43.0.rc1.1336.g36b5255a03ac