drivers: gpu: Drop unlikely before IS_ERR(_OR_NULL)

IS_ERR(_OR_NULL) already contain an 'unlikely' compiler flag and there
is no need to do that again from its callers. Drop it.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Sinclair Yeh <syeh@vmware.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c
index bf080abc86d12c9bdcb8947d1d1d637d0b2a4bb7..4e19d0f9cc3094ae9585eef447c2439589a4a304 100644 (file)
--- a/drivers/gpu/drm/ttm/ttm_tt.c
+++ b/drivers/gpu/drm/ttm/ttm_tt.c
@@ -340,7 +340,7 @@ int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistent_swap_storage)
                swap_storage = shmem_file_setup("ttm swap",
                                                ttm->num_pages << PAGE_SHIFT,
                                                0);
-               if (unlikely(IS_ERR(swap_storage))) {
+               if (IS_ERR(swap_storage)) {
                        pr_err("Failed allocating swap storage\n");
                        return PTR_ERR(swap_storage);
                }
@@ -354,7 +354,7 @@ int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistent_swap_storage)
                if (unlikely(from_page == NULL))
                        continue;
                to_page = shmem_read_mapping_page(swap_space, i);
-               if (unlikely(IS_ERR(to_page))) {
+               if (IS_ERR(to_page)) {
                        ret = PTR_ERR(to_page);
                        goto out_err;
                }

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_context.c b/drivers/gpu/drm/vmwgfx/vmwgfx_context.c
index 5ac92874404d60a6497c423f6e200bc35b922bf9..44e6ecba3de72fefb5b5b8d65eb62f3c3795ba7f 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_context.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_context.c
@@ -159,7 +159,7 @@ static int vmw_gb_context_init(struct vmw_private *dev_priv,
 
        if (dev_priv->has_mob) {
                uctx->man = vmw_cmdbuf_res_man_create(dev_priv);
-               if (unlikely(IS_ERR(uctx->man))) {
+               if (IS_ERR(uctx->man)) {
                        ret = PTR_ERR(uctx->man);
                        uctx->man = NULL;
                        goto out_err;

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
index 620bb5cf617c9689a9113e989d585346f420de3d..6218a36cf01a2143cf94f9aae7ea6f7788091495 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
@@ -1054,7 +1054,7 @@ static long vmw_generic_ioctl(struct file *filp, unsigned int cmd,
                return -EINVAL;
 
        vmaster = vmw_master_check(dev, file_priv, flags);
-       if (unlikely(IS_ERR(vmaster))) {
+       if (IS_ERR(vmaster)) {
                ret = PTR_ERR(vmaster);
 
                if (ret != -ERESTARTSYS)