diff options
| author | Fabian Frederick <fabf@skynet.be> | 2015-05-04 19:03:54 +0200 |
|---|---|---|
| committer | Rob Clark <robdclark@gmail.com> | 2015-06-11 13:11:04 -0400 |
| commit | 73dbf69638b760ce62fe6df4cece983ef28abc13 (patch) | |
| tree | 3abfd5e7d38408e22f6c616ef4934de9d762db7f /drivers/gpu/drm/msm/dsi | |
| parent | 68cdbed90777ed0291214f30a3532a8f795b481e (diff) | |
| download | op-kernel-dev-73dbf69638b760ce62fe6df4cece983ef28abc13.zip op-kernel-dev-73dbf69638b760ce62fe6df4cece983ef28abc13.tar.gz | |
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>
Diffstat (limited to 'drivers/gpu/drm/msm/dsi')
| -rw-r--r-- | drivers/gpu/drm/msm/dsi/dsi_phy.c | 4 |
1 files 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; } |
