diff options
author | Tobias Jakobi <tjakobi@math.uni-bielefeld.de> | 2015-04-06 19:14:51 -0400 |
---|---|---|
committer | Inki Dae <inki.dae@samsung.com> | 2015-04-12 22:39:40 -0400 |
commit | 7ded85885d49bac7df1836ea3ac5612d9afcc8de (patch) | |
tree | e119a26b3c4bf5b8c0f15f14404ae658a4872410 /drivers/gpu/drm/exynos | |
parent | 1e6d459df61f5386b9d00c9b5b4520240e70eded (diff) |
drm/exynos: remove superfluous error messages
The messages are redundant since 'check_fb_gem_memory_type'
already prints out exactly the same string when it fails.
Reviewed-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de>
Acked-by: Joonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
Diffstat (limited to 'drivers/gpu/drm/exynos')
-rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_fb.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fb.c b/drivers/gpu/drm/exynos/exynos_drm_fb.c index d346d1e6eda0..929cb03a8eab 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fb.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fb.c | |||
@@ -151,10 +151,8 @@ exynos_drm_framebuffer_init(struct drm_device *dev, | |||
151 | exynos_gem_obj = to_exynos_gem_obj(obj); | 151 | exynos_gem_obj = to_exynos_gem_obj(obj); |
152 | 152 | ||
153 | ret = check_fb_gem_memory_type(dev, exynos_gem_obj); | 153 | ret = check_fb_gem_memory_type(dev, exynos_gem_obj); |
154 | if (ret < 0) { | 154 | if (ret < 0) |
155 | DRM_ERROR("cannot use this gem memory type for fb.\n"); | 155 | return ERR_PTR(ret); |
156 | return ERR_PTR(-EINVAL); | ||
157 | } | ||
158 | 156 | ||
159 | exynos_fb = kzalloc(sizeof(*exynos_fb), GFP_KERNEL); | 157 | exynos_fb = kzalloc(sizeof(*exynos_fb), GFP_KERNEL); |
160 | if (!exynos_fb) | 158 | if (!exynos_fb) |
@@ -250,10 +248,8 @@ exynos_user_fb_create(struct drm_device *dev, struct drm_file *file_priv, | |||
250 | exynos_fb->exynos_gem_obj[i] = exynos_gem_obj; | 248 | exynos_fb->exynos_gem_obj[i] = exynos_gem_obj; |
251 | 249 | ||
252 | ret = check_fb_gem_memory_type(dev, exynos_gem_obj); | 250 | ret = check_fb_gem_memory_type(dev, exynos_gem_obj); |
253 | if (ret < 0) { | 251 | if (ret < 0) |
254 | DRM_ERROR("cannot use this gem memory type for fb.\n"); | ||
255 | goto err_unreference; | 252 | goto err_unreference; |
256 | } | ||
257 | } | 253 | } |
258 | 254 | ||
259 | ret = drm_framebuffer_init(dev, &exynos_fb->fb, &exynos_drm_fb_funcs); | 255 | ret = drm_framebuffer_init(dev, &exynos_fb->fb, &exynos_drm_fb_funcs); |