Commit 663ba742 authored by Andrey Smirnov's avatar Andrey Smirnov Committed by Linus Walleij

gpio: vf610: Use PTR_ERR_OR_ZERO() in vf610_gpio_probe()

Simplify error checking code by replacing multiple ERR macros with a
call to PTR_ERR_OR_ZERO. No functional change intended.
Signed-off-by: default avatarAndrey Smirnov <andrew.smirnov@gmail.com>
Cc: Chris Healy <cphealy@gmail.com>
Cc: linux-gpio@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Reviewed-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent cd6c84d8
...@@ -265,7 +265,8 @@ static int vf610_gpio_probe(struct platform_device *pdev) ...@@ -265,7 +265,8 @@ static int vf610_gpio_probe(struct platform_device *pdev)
return port->irq; return port->irq;
port->clk_port = devm_clk_get(dev, "port"); port->clk_port = devm_clk_get(dev, "port");
if (!IS_ERR(port->clk_port)) { ret = PTR_ERR_OR_ZERO(port->clk_port);
if (!ret) {
ret = clk_prepare_enable(port->clk_port); ret = clk_prepare_enable(port->clk_port);
if (ret) if (ret)
return ret; return ret;
...@@ -273,16 +274,17 @@ static int vf610_gpio_probe(struct platform_device *pdev) ...@@ -273,16 +274,17 @@ static int vf610_gpio_probe(struct platform_device *pdev)
port->clk_port); port->clk_port);
if (ret) if (ret)
return ret; return ret;
} else if (port->clk_port == ERR_PTR(-EPROBE_DEFER)) { } else if (ret == -EPROBE_DEFER) {
/* /*
* Percolate deferrals, for anything else, * Percolate deferrals, for anything else,
* just live without the clocking. * just live without the clocking.
*/ */
return PTR_ERR(port->clk_port); return ret;
} }
port->clk_gpio = devm_clk_get(dev, "gpio"); port->clk_gpio = devm_clk_get(dev, "gpio");
if (!IS_ERR(port->clk_gpio)) { ret = PTR_ERR_OR_ZERO(port->clk_gpio);
if (!ret) {
ret = clk_prepare_enable(port->clk_gpio); ret = clk_prepare_enable(port->clk_gpio);
if (ret) if (ret)
return ret; return ret;
...@@ -290,8 +292,8 @@ static int vf610_gpio_probe(struct platform_device *pdev) ...@@ -290,8 +292,8 @@ static int vf610_gpio_probe(struct platform_device *pdev)
port->clk_gpio); port->clk_gpio);
if (ret) if (ret)
return ret; return ret;
} else if (port->clk_gpio == ERR_PTR(-EPROBE_DEFER)) { } else if (ret == -EPROBE_DEFER) {
return PTR_ERR(port->clk_gpio); return ret;
} }
gc = &port->gc; gc = &port->gc;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment