From: Fabian Frederick <fabf@skynet.be>
Date: Mon, 4 May 2015 17:03:55 +0000 (+0200)
Subject: drm/msm: use IS_ERR() to check regulator_get() return
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=bdc80de2a6dbaa0d08c393b4ba8912a0ad4b047f;p=deliverable%2Flinux.git

drm/msm: use IS_ERR() to check regulator_get() return

regulator_get() never returns NULL. There's no need for IS_ERR_OR_NULL()

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Rob Clark <robdclark@gmail.com>
---

diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c
index ae061653ca06..517e0709b77d 100644
--- a/drivers/gpu/drm/msm/dsi/dsi_host.c
+++ b/drivers/gpu/drm/msm/dsi/dsi_host.c
@@ -273,7 +273,7 @@ static const struct dsi_config *dsi_get_config(struct msm_dsi_host *msm_host)
 	u32 major = 0, minor = 0;
 
 	gdsc_reg = regulator_get(&msm_host->pdev->dev, "gdsc");
-	if (IS_ERR_OR_NULL(gdsc_reg)) {
+	if (IS_ERR(gdsc_reg)) {
 		pr_err("%s: cannot get gdsc\n", __func__);
 		goto fail;
 	}