summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin Lambert <lambert.quentin@gmail.com>2014-11-06 17:45:55 +0100
committerBjorn Helgaas <bhelgaas@google.com>2014-11-10 21:08:07 -0700
commit754834b9caae8d1380f66a5f0337547e9361094d (patch)
tree86bc1a50ca3a0a72bd59125b36db4e76d347fe33
parentff0387c3777f2438bad2088abe442c9f231b0be4 (diff)
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>
-rw-r--r--drivers/pci/hotplug/ibmphp_res.c5
-rw-r--r--drivers/pci/pci.c6
2 files changed, 2 insertions, 9 deletions
diff --git a/drivers/pci/hotplug/ibmphp_res.c b/drivers/pci/hotplug/ibmphp_res.c
index 219ba8090a37..f279060cf6e2 100644
--- 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 625a4ace10b4..9a5871f530a7 100644
--- 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);