PCI: remove an unnecessary if condition before a return statement

PATCH Superseded Quentin Lambert 1 participant 1 message Nov 6, 2014 PCI

Share & tools

Quentin Lambert

author

2014-11-06 16:41 UTC #0 lore raw

PATCH 1/1 PCI: remove an unnecessary if condition before a return statement

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 <[email protected]>

---
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(-)

drivers/pci/hotplug/ibmphp_res.c +1 -4

index 219ba80..db5cb8d 100644
@@ -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 ();
 }
 
 /********************************************************************************

drivers/pci/pci.c +1 -5

index 625a4ac..9a5871f 100644
@@ -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);

Signature · 1 line

1.9.1