[PATCH 2/3] drm/exynos: mixer: Fix incorrect usage of IS_ERR_OR_NULL

[Sachin Kamat]

Use IS_ERR instead of IS_ERR_OR_NULL on clk_get results.

Signed-off-by: Sachin Kamat <sachin.ka...@linaro.org>
---
 drivers/gpu/drm/exynos/exynos_mixer.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c 
b/drivers/gpu/drm/exynos/exynos_mixer.c
index 2f4f72f..2bd85c8 100644
--- a/drivers/gpu/drm/exynos/exynos_mixer.c
+++ b/drivers/gpu/drm/exynos/exynos_mixer.c
@@ -1047,13 +1047,13 @@ static int mixer_resources_init(struct 
exynos_drm_hdmi_context *ctx,
        spin_lock_init(&mixer_res->reg_slock);
 
        mixer_res->mixer = devm_clk_get(dev, "mixer");
-       if (IS_ERR_OR_NULL(mixer_res->mixer)) {
+       if (IS_ERR(mixer_res->mixer)) {
                dev_err(dev, "failed to get clock 'mixer'\n");
                return -ENODEV;
        }
 
        mixer_res->sclk_hdmi = devm_clk_get(dev, "sclk_hdmi");
-       if (IS_ERR_OR_NULL(mixer_res->sclk_hdmi)) {
+       if (IS_ERR(mixer_res->sclk_hdmi)) {
                dev_err(dev, "failed to get clock 'sclk_hdmi'\n");
                return -ENODEV;
        }
@@ -1096,17 +1096,17 @@ static int vp_resources_init(struct 
exynos_drm_hdmi_context *ctx,
        struct resource *res;
 
        mixer_res->vp = devm_clk_get(dev, "vp");
-       if (IS_ERR_OR_NULL(mixer_res->vp)) {
+       if (IS_ERR(mixer_res->vp)) {
                dev_err(dev, "failed to get clock 'vp'\n");
                return -ENODEV;
        }
        mixer_res->sclk_mixer = devm_clk_get(dev, "sclk_mixer");
-       if (IS_ERR_OR_NULL(mixer_res->sclk_mixer)) {
+       if (IS_ERR(mixer_res->sclk_mixer)) {
                dev_err(dev, "failed to get clock 'sclk_mixer'\n");
                return -ENODEV;
        }
        mixer_res->sclk_dac = devm_clk_get(dev, "sclk_dac");
-       if (IS_ERR_OR_NULL(mixer_res->sclk_dac)) {
+       if (IS_ERR(mixer_res->sclk_dac)) {
                dev_err(dev, "failed to get clock 'sclk_dac'\n");
                return -ENODEV;
        }
-- 
1.7.4.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel