soc/qcom/smp2p: Use common error handling code in qcom_smp2p_probe()

PATCH New SF Markus Elfring 1 participant 1 message Nov 2, 2017

Subsystems (3)

Arm Qualcomm mailing list Kernel janitors Arm Qualcomm support

lore

Share & tools

lore

SF Markus Elfring

author

2017-11-02 18:33 UTC #0 lore raw

PATCH 1/1 soc/qcom/smp2p: Use common error handling code in qcom_smp2p_probe()

From: Markus Elfring <[email protected]>
Date: Thu, 2 Nov 2017 19:27:33 +0100

* Add a jump target so that a specific error message is stored only once at the end of this function implementation.

* Replace two calls of the function "dev_err" by goto statements.

* Adjust two condition checks.

This issue was detected by using the Coccinelle software.

Signed-off-by Markus Elfring <[email protected]>

---
 drivers/soc/qcom/smp2p.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

drivers/soc/qcom/smp2p.c +8 -8

index f51fb2ea7200..b1040943da1a 100644
@@ -465,17 +465,13 @@ static int qcom_smp2p_probe(struct platform_device *pdev)
 
 	key = "qcom,local-pid";
 	ret = of_property_read_u32(pdev->dev.of_node, key, &smp2p->local_pid);
-	if (ret < 0) {
-		dev_err(&pdev->dev, "failed to read %s\n", key);
-		return -EINVAL;
-	}
+	if (ret)
+		goto report_read_failure;
 
 	key = "qcom,remote-pid";
 	ret = of_property_read_u32(pdev->dev.of_node, key, &smp2p->remote_pid);
-	if (ret < 0) {
-		dev_err(&pdev->dev, "failed to read %s\n", key);
-		return -EINVAL;
-	}
+	if (ret)
+		goto report_read_failure;
 
 	irq = platform_get_irq(pdev, 0);
 	if (irq < 0) {

@@ -541,6 +537,10 @@ static int qcom_smp2p_probe(struct platform_device *pdev)
 	smp2p->out->valid_entries = 0;
 
 	return ret;
+
+report_read_failure:
+	dev_err(&pdev->dev, "failed to read %s\n", key);
+	return -EINVAL;
 }
 
 static int qcom_smp2p_remove(struct platform_device *pdev)

Signature · 1 line

2.15.0