PCI: Simplify if-return sequences

Simplify a trivial if-return sequence.  Possibly combine with a preceding
function call.

Generated by: scripts/coccinelle/misc/simple_return.cocci

Signed-off-by: Quentin Lambert <lambert.quentin@gmail.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/pci/hotplug/ibmphp_res.c b/drivers/pci/hotplug/ibmphp_res.c
index 219ba8090a375d64d1bee01321372e4817d6596d..f279060cf6e25c7b6e9c6b09c1c0a21d66b7e13e 100644 (file)
--- a/drivers/pci/hotplug/ibmphp_res.c
+++ b/drivers/pci/hotplug/ibmphp_res.c
@@ -376,10 +376,7 @@ int __init ibmphp_rsrc_init (void)
                if (rc)
                        return rc;
        }
-       rc = once_over ();  /* This is to align ranges (so no -1) */
-       if (rc)
-               return rc;
-       return 0;
+       return once_over ();    /* This is to align ranges (so no -1) */
 }
 
 /********************************************************************************

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 625a4ace10b4411aed1cbda278a3851d9299965d..9a5871f530a7819bfaff9695c2dd9e172e8a41d5 100644 (file)
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1012,11 +1012,7 @@ int pci_save_state(struct pci_dev *dev)
        if (i != 0)
                return i;
 
-       i = pci_save_vc_state(dev);
-       if (i != 0)
-               return i;
-
-       return 0;
+       return pci_save_vc_state(dev);
 }
 EXPORT_SYMBOL(pci_save_state);