From: Alex Elder <elder@linaro.org>
Date: Thu, 22 Oct 2015 18:03:26 +0000 (-0500)
Subject: greybus: db3-platform: get rid of redundant gpio tests
X-Git-Tag: v4.9-rc1~119^2~378^2~21^2~1090
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=76be20a2f39d3b08bdf9b653419fbd367920e856;p=linux.git

greybus: db3-platform: get rid of redundant gpio tests

In apb_ctrl_get_devtree_data(), the value returned by
of_get_named_gpio() has a redundant test for a negative
return value.  GPIO numbers are non-negative, so this
test is redundant--testing gpio_is_valid() is sufficient.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
---

diff --git a/drivers/staging/greybus/db3-platform.c b/drivers/staging/greybus/db3-platform.c
index 3adc68dff9ee..31f27f0628c4 100644
--- a/drivers/staging/greybus/db3-platform.c
+++ b/drivers/staging/greybus/db3-platform.c
@@ -189,35 +189,30 @@ static int apb_ctrl_get_devtree_data(struct device *dev,
 
 	/* fetch control signals */
 	apb_data->ctrl.wake_detect = of_get_named_gpio(np, "wake-detect-gpios", 0);
-	if (apb_data->ctrl.wake_detect < 0 ||
-			!gpio_is_valid(apb_data->ctrl.wake_detect)) {
+	if (!gpio_is_valid(apb_data->ctrl.wake_detect)) {
 		dev_err(dev, "failed to get wake detect gpio\n");
 		return apb_data->ctrl.wake_detect;
 	}
 
 	apb_data->ctrl.reset = of_get_named_gpio(np, "reset-gpios", 0);
-	if (apb_data->ctrl.reset < 0 ||
-			!gpio_is_valid(apb_data->ctrl.reset)) {
+	if (!gpio_is_valid(apb_data->ctrl.reset)) {
 		dev_err(dev, "failed to get reset gpio\n");
 		return apb_data->ctrl.reset;
 	}
 
 	apb_data->ctrl.boot_ret = of_get_named_gpio(np, "boot-ret-gpios", 0);
-	if (apb_data->ctrl.boot_ret < 0 ||
-			!gpio_is_valid(apb_data->ctrl.boot_ret)) {
+	if (!gpio_is_valid(apb_data->ctrl.boot_ret)) {
 		dev_err(dev, "failed to get boot retention gpio\n");
 		return apb_data->ctrl.boot_ret;
 	}
 
 	/* It's not mandatory to support power management interface */
 	apb_data->ctrl.pwroff = of_get_named_gpio(np, "pwr-off-gpios", 0);
-	if (apb_data->ctrl.pwroff < 0 ||
-			!gpio_is_valid(apb_data->ctrl.pwroff))
+	if (!gpio_is_valid(apb_data->ctrl.pwroff))
 		dev_info(dev, "failed to get power off gpio\n");
 
 	apb_data->ctrl.pwrdn = of_get_named_gpio(np, "pwr-down-gpios", 0);
-	if (apb_data->ctrl.pwrdn < 0 ||
-			!gpio_is_valid(apb_data->ctrl.pwrdn))
+	if (!gpio_is_valid(apb_data->ctrl.pwrdn))
 		dev_info(dev, "failed to get power down gpio\n");
 
 	/* Regulators are optional, as we may have fixed supply coming in */