From: Viresh Kumar <viresh.kumar@linaro.org>
Date: Mon, 11 Jan 2016 05:59:11 +0000 (+0530)
Subject: greybus: arche-apb: devm_regulator_get() doesn't return NULL
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bd62fa5e1067bd5a3c8421ae3de0021a67223e22;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

greybus: arche-apb: devm_regulator_get() doesn't return NULL

And so we don't need to check for it.

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

diff --git a/drivers/staging/greybus/arche-apb-ctrl.c b/drivers/staging/greybus/arche-apb-ctrl.c
index b06bb3453ca4..1ae2c06c8e33 100644
--- a/drivers/staging/greybus/arche-apb-ctrl.c
+++ b/drivers/staging/greybus/arche-apb-ctrl.c
@@ -246,13 +246,13 @@ static int apb_ctrl_get_devtree_data(struct platform_device *pdev,
 
 	/* Regulators are optional, as we may have fixed supply coming in */
 	apb->vcore = devm_regulator_get(dev, "vcore");
-	if (IS_ERR_OR_NULL(apb->vcore)) {
+	if (IS_ERR(apb->vcore)) {
 		dev_info(dev, "no core regulator found\n");
 		apb->vcore = NULL;
 	}
 
 	apb->vio = devm_regulator_get(dev, "vio");
-	if (IS_ERR_OR_NULL(apb->vio)) {
+	if (IS_ERR(apb->vio)) {
 		dev_info(dev, "no IO regulator found\n");
 		apb->vio = NULL;
 	}