[PATCH 1/2 linux-next] drm/msm: use IS_ERR() to check msm_ioremap() return

[PATCH 1/2 linux-next] drm/msm: use IS_ERR() to check msm_ioremap() return

[Fabian Frederick]

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

Signed-off-by: Fabian Frederick <fabf@skynet.be>
---
 drivers/gpu/drm/msm/dsi/dsi_phy.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/msm/dsi/dsi_phy.c b/drivers/gpu/drm/msm/dsi/dsi_phy.c
index f0cea89..61af193 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;
 	}
-- 
1.9.1

[PATCH 2/2 linux-next] drm/msm: use IS_ERR() to check regulator_get() return

[Fabian Frederick]

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

Signed-off-by: Fabian Frederick <fabf@skynet.be>
---
 drivers/gpu/drm/msm/dsi/dsi_host.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c
index 956b224..642cbaf 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;
 	}
-- 
1.9.1

Re: [PATCH 2/2 linux-next] drm/msm: use IS_ERR() to check regulator_get() return

[Fabian Frederick]

Please ignore this patch, I just noticed conditional regulator_get()
definition (#if defined(CONFIG_REGULATOR))

Regards,
Fabian