diff mbox

PCI: remove an unnecessary if condition before a return statement

Message ID 20141106164555.GA19353@wrath
State Accepted
Headers show

Commit Message

Quentin Lambert Nov. 6, 2014, 4:45 p.m. UTC 
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>
---
 I ran coccinelle on the whole directory and the only other match was
 drivers/pci/host/pci-imx6.c, but the current version does not seem to
 be compiling.

 drivers/pci/hotplug/ibmphp_res.c | 5 +----
 drivers/pci/pci.c                | 6 +-----
 2 files changed, 2 insertions(+), 9 deletions(-)
diff mbox

Patch

diff --git a/drivers/pci/hotplug/ibmphp_res.c b/drivers/pci/hotplug/ibmphp_res.c
index 219ba80..db5cb8d 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 ();
 }
 
 /********************************************************************************
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 625a4ac..9a5871f 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);