From: Fabian Frederick <fabf@skynet.be>
Date: Mon, 4 May 2015 17:03:54 +0000 (+0200)
Subject: drm/msm: use IS_ERR() to check msm_ioremap() return
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=73dbf69638b760ce62fe6df4cece983ef28abc13;p=linux-beck.git

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

msm_ioremap() 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_phy.c b/drivers/gpu/drm/msm/dsi/dsi_phy.c
index f0cea8927388..61af19312711 100644
--- a/drivers/gpu/drm/msm/dsi/dsi_phy.c
+++ b/drivers/gpu/drm/msm/dsi/dsi_phy.c
@@ -300,12 +300,12 @@ struct msm_dsi_phy *msm_dsi_phy_init(struct platform_device *pdev,
 		return NULL;
 
 	phy->base = msm_ioremap(pdev, "dsi_phy", "DSI_PHY");
-	if (IS_ERR_OR_NULL(phy->base)) {
+	if (IS_ERR(phy->base)) {
 		pr_err("%s: failed to map phy base\n", __func__);
 		return NULL;
 	}
 	phy->reg_base = msm_ioremap(pdev, "dsi_phy_regulator", "DSI_PHY_REG");
-	if (IS_ERR_OR_NULL(phy->reg_base)) {
+	if (IS_ERR(phy->reg_base)) {
 		pr_err("%s: failed to map phy regulator base\n", __func__);
 		return NULL;
 	}