Merge tag 'drm-misc-next-2017-03-06' of git://anongit.freedesktop.org/git/drm-misc...

[mirror_ubuntu-artful-kernel.git] / drivers / gpu / drm / vmwgfx / vmwgfx_fence.c

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
index 6541dd8b82dc0747433403b64795843a29e0544c..b399f03a988d8e6a6b2af5995c2bb4fdbd07a054 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
@@ -728,8 +728,7 @@ int vmw_fence_obj_wait_ioctl(struct drm_device *dev, void *data,
 
        base = ttm_base_object_lookup(tfile, arg->handle);
        if (unlikely(base == NULL)) {
-               printk(KERN_ERR "Wait invalid fence object handle "
-                      "0x%08lx.\n",
+               pr_err("Wait invalid fence object handle 0x%08lx\n",
                       (unsigned long)arg->handle);
                return -EINVAL;
        }
@@ -773,8 +772,7 @@ int vmw_fence_obj_signaled_ioctl(struct drm_device *dev, void *data,
 
        base = ttm_base_object_lookup(tfile, arg->handle);
        if (unlikely(base == NULL)) {
-               printk(KERN_ERR "Fence signaled invalid fence object handle "
-                      "0x%08lx.\n",
+               pr_err("Fence signaled invalid fence object handle 0x%08lx\n",
                       (unsigned long)arg->handle);
                return -EINVAL;
        }