Hi Chengguang,
Thanks for doing this. Will include this for vmwgfx-next
Reviewed-by: Deepak Rawat
On Thu, 2019-02-21 at 10:09 +0800, Chengguang Xu wrote:
> unlikely has already included in IS_ERR(), so just
> remove redundant unlikely annotation.
>
> Signed-off-by: Chengguang Xu
> ---
> drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 2 +-
> drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_context.c
> b/drivers/gpu/drm/vmwgfx/vmwgfx_context.c
> index 14bd760a62fd..694fabafaeee 100644
> --- 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,
>
> >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 88b8178d4687..1cde07cf3067 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
> @@ -638,7 +638,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);
> @@ -3799,7 +3799,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);
___
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
