aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/exynos
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2013-03-21 06:03:58 -0400
committerInki Dae <daeinki@gmail.com>2013-04-16 11:07:23 -0400
commitc11182d6e4a3baa0c5f7aa3c13805a6ab6c6a9a8 (patch)
tree2e3a536476bcdaa21bd8525c0501519773211dec /drivers/gpu/drm/exynos
parentee7cbafa01aa6c09a7860686964770183d06b5cb (diff)
drm/exynos: mixer: Fix incorrect usage of IS_ERR_OR_NULL
Use IS_ERR instead of IS_ERR_OR_NULL on clk_get results. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Inki Dae <inki.dae@samsung.com>
Diffstat (limited to 'drivers/gpu/drm/exynos')
-rw-r--r--drivers/gpu/drm/exynos/exynos_mixer.c10
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 f580cb0dd518..f08e2512c931 100644
--- a/drivers/gpu/drm/exynos/exynos_mixer.c
+++ b/drivers/gpu/drm/exynos/exynos_mixer.c
@@ -1043,13 +1043,13 @@ static int mixer_resources_init(struct exynos_drm_hdmi_context *ctx,
1043 spin_lock_init(&mixer_res->reg_slock); 1043 spin_lock_init(&mixer_res->reg_slock);
1044 1044
1045 mixer_res->mixer = devm_clk_get(dev, "mixer"); 1045 mixer_res->mixer = devm_clk_get(dev, "mixer");
1046 if (IS_ERR_OR_NULL(mixer_res->mixer)) { 1046 if (IS_ERR(mixer_res->mixer)) {
1047 dev_err(dev, "failed to get clock 'mixer'\n"); 1047 dev_err(dev, "failed to get clock 'mixer'\n");
1048 return -ENODEV; 1048 return -ENODEV;
1049 } 1049 }
1050 1050
1051 mixer_res->sclk_hdmi = devm_clk_get(dev, "sclk_hdmi"); 1051 mixer_res->sclk_hdmi = devm_clk_get(dev, "sclk_hdmi");
1052 if (IS_ERR_OR_NULL(mixer_res->sclk_hdmi)) { 1052 if (IS_ERR(mixer_res->sclk_hdmi)) {
1053 dev_err(dev, "failed to get clock 'sclk_hdmi'\n"); 1053 dev_err(dev, "failed to get clock 'sclk_hdmi'\n");
1054 return -ENODEV; 1054 return -ENODEV;
1055 } 1055 }
@@ -1092,17 +1092,17 @@ static int vp_resources_init(struct exynos_drm_hdmi_context *ctx,
1092 struct resource *res; 1092 struct resource *res;
1093 1093
1094 mixer_res->vp = devm_clk_get(dev, "vp"); 1094 mixer_res->vp = devm_clk_get(dev, "vp");
1095 if (IS_ERR_OR_NULL(mixer_res->vp)) { 1095 if (IS_ERR(mixer_res->vp)) {
1096 dev_err(dev, "failed to get clock 'vp'\n"); 1096 dev_err(dev, "failed to get clock 'vp'\n");
1097 return -ENODEV; 1097 return -ENODEV;
1098 } 1098 }
1099 mixer_res->sclk_mixer = devm_clk_get(dev, "sclk_mixer"); 1099 mixer_res->sclk_mixer = devm_clk_get(dev, "sclk_mixer");
1100 if (IS_ERR_OR_NULL(mixer_res->sclk_mixer)) { 1100 if (IS_ERR(mixer_res->sclk_mixer)) {
1101 dev_err(dev, "failed to get clock 'sclk_mixer'\n"); 1101 dev_err(dev, "failed to get clock 'sclk_mixer'\n");
1102 return -ENODEV; 1102 return -ENODEV;
1103 } 1103 }
1104 mixer_res->sclk_dac = devm_clk_get(dev, "sclk_dac"); 1104 mixer_res->sclk_dac = devm_clk_get(dev, "sclk_dac");
1105 if (IS_ERR_OR_NULL(mixer_res->sclk_dac)) { 1105 if (IS_ERR(mixer_res->sclk_dac)) {
1106 dev_err(dev, "failed to get clock 'sclk_dac'\n"); 1106 dev_err(dev, "failed to get clock 'sclk_dac'\n");
1107 return -ENODEV; 1107 return -ENODEV;
1108 } 1108 }