drm/vmwgfx: remove redundant unlikely annotation

unlikely has already included in IS_ERR(), so just
remove redundant unlikely annotation.

Signed-off-by: Chengguang Xu <cgxu519@gmx.com>
Reviewed-by: Deepak Rawat <drawat@vmware.com>
Signed-off-by: Deepak Rawat <drawat@vmware.com>

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_context.c b/drivers/gpu/drm/vmwgfx/vmwgfx_context.c
index 14bd760a62fd7fda3053d9d244826984f6c7b5f7..694fabafaeeefbd8ac773fe729b62143407437ad 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_context.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_context.c
@@ -210,7 +210,7 @@ static int vmw_gb_context_init(struct vmw_private *dev_priv,
                for (i = 0; i < SVGA_COTABLE_DX10_MAX; ++i) {
                        uctx->cotables[i] = vmw_cotable_alloc(dev_priv,
                                                              &uctx->res, i);
-                       if (unlikely(IS_ERR(uctx->cotables[i]))) {
+                       if (IS_ERR(uctx->cotables[i])) {
                                ret = PTR_ERR(uctx->cotables[i]);
                                goto out_cotables;
                        }

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
index dc5698fbb6541e647e48f23594f3756e3530558e..4955a48a9d8629630e0b67700498d4358496f054 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
@@ -660,7 +660,7 @@ vmw_cmd_res_check(struct vmw_private *dev_priv,
 
                res = vmw_user_resource_noref_lookup_handle
                        (dev_priv, sw_context->fp->tfile, *id_loc, converter);
-               if (unlikely(IS_ERR(res))) {
+               if (IS_ERR(res)) {
                        DRM_ERROR("Could not find or use resource 0x%08x.\n",
                                  (unsigned int) *id_loc);
                        return PTR_ERR(res);
@@ -3835,7 +3835,7 @@ static int vmw_execbuf_tie_context(struct vmw_private *dev_priv,
        res = vmw_user_resource_noref_lookup_handle
                (dev_priv, sw_context->fp->tfile, handle,
                 user_context_converter);
-       if (unlikely(IS_ERR(res))) {
+       if (IS_ERR(res)) {
                DRM_ERROR("Could not find or user DX context 0x%08x.\n",
                          (unsigned) handle);
                return PTR_ERR(res);