From: Gomonovych, Vasyl <gomonovych@gmail.com>
Date: Tue, 28 Nov 2017 23:04:06 +0000 (+0100)
Subject: clk: mvebu: armada-37xx-periph: Use PTR_ERR_OR_ZERO()
X-Git-Tag: v4.16-rc1~97^2~3^3
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9713588f8cd96069716bd8daf720dc7ff921af89;p=users%2Fjedix%2Flinux-maple.git

clk: mvebu: armada-37xx-periph: Use PTR_ERR_OR_ZERO()

Fix ptr_ret.cocci warnings:
drivers/clk/mvebu/armada-37xx-periph.c:362:1-3: WARNING: PTR_ERR_OR_ZERO can be used

Use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) + PTR_ERR

Generated by: scripts/coccinelle/api/ptr_ret.cocci

Signed-off-by: Vasyl Gomonovych <gomonovych@gmail.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---

diff --git a/drivers/clk/mvebu/armada-37xx-periph.c b/drivers/clk/mvebu/armada-37xx-periph.c
index cecb0fdfaef6c..72e2ce46f4b02 100644
--- a/drivers/clk/mvebu/armada-37xx-periph.c
+++ b/drivers/clk/mvebu/armada-37xx-periph.c
@@ -359,10 +359,7 @@ static int armada_3700_add_composite_clk(const struct clk_periph_data *data,
 				       mux_ops, rate_hw, rate_ops,
 				       gate_hw, gate_ops, CLK_IGNORE_UNUSED);
 
-	if (IS_ERR(*hw))
-		return PTR_ERR(*hw);
-
-	return 0;
+	return PTR_ERR_OR_ZERO(*hw);
 }
 
 static int armada_3700_periph_clock_probe(struct platform_device *pdev)