leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/vmwgfx: remove redundant unlikely annotation

Browse Source 
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>
This commit is contained in:
Chengguang Xu 2019-03-01 10:14:06 -08:00 committed by Deepak Rawat
parent b2130cca9c
commit 4efa666115
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/vmwgfx/vmwgfx_context.c
View File

@ -210,7 +210,7 @@ static int vmw_gb_context_init(struct vmw_private *dev_priv,
for (i = 0; i < SVGA_COTABLE_DX10_MAX; ++i) { for (i = 0; i < SVGA_COTABLE_DX10_MAX; ++i) {
uctx->cotables[i] = vmw_cotable_alloc(dev_priv, uctx->cotables[i] = vmw_cotable_alloc(dev_priv,
&uctx->res, i); &uctx->res, i);
if (unlikely(IS_ERR(uctx->cotables[i]))) { if (IS_ERR(uctx->cotables[i])) {
ret = PTR_ERR(uctx->cotables[i]); ret = PTR_ERR(uctx->cotables[i]);
goto out_cotables; goto out_cotables;
} }

4
drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
View File

@ -660,7 +660,7 @@ vmw_cmd_res_check(struct vmw_private *dev_priv,
res = vmw_user_resource_noref_lookup_handle res = vmw_user_resource_noref_lookup_handle
(dev_priv, sw_context->fp->tfile, *id_loc, converter); (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", DRM_ERROR("Could not find or use resource 0x%08x.\n",
(unsigned int) *id_loc); (unsigned int) *id_loc);
return PTR_ERR(res); 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 res = vmw_user_resource_noref_lookup_handle
(dev_priv, sw_context->fp->tfile, handle, (dev_priv, sw_context->fp->tfile, handle,
user_context_converter); user_context_converter);
if (unlikely(IS_ERR(res))) { if (IS_ERR(res)) {
DRM_ERROR("Could not find or user DX context 0x%08x.\n", DRM_ERROR("Could not find or user DX context 0x%08x.\n",
(unsigned) handle); (unsigned) handle);
return PTR_ERR(res); return PTR_ERR(res);