Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-15 13:15:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

drivers: gpu: Drop unlikely before IS_ERR(_OR_NULL)

Browse Source 
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>
This commit is contained in:
Viresh Kumar 2015-07-31 14:08:24 +05:30 committed by Daniel Vetter
parent 0843010bbd
commit 55579cfe67
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/ttm/ttm_tt.c
View File

@ -340,7 +340,7 @@ int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistent_swap_storage)
swap_storage = shmem_file_setup("ttm swap", swap_storage = shmem_file_setup("ttm swap",
ttm->num_pages << PAGE_SHIFT, ttm->num_pages << PAGE_SHIFT,
0); 0);
if (unlikely(IS_ERR(swap_storage))) { if (IS_ERR(swap_storage)) {
pr_err("Failed allocating swap storage\n"); pr_err("Failed allocating swap storage\n");
return PTR_ERR(swap_storage); 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)) if (unlikely(from_page == NULL))
continue; continue;
to_page = shmem_read_mapping_page(swap_space, i); 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); ret = PTR_ERR(to_page);
goto out_err; goto out_err;
} }

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

@ -159,7 +159,7 @@ static int vmw_gb_context_init(struct vmw_private *dev_priv,
if (dev_priv->has_mob) { if (dev_priv->has_mob) {
uctx->man = vmw_cmdbuf_res_man_create(dev_priv); 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); ret = PTR_ERR(uctx->man);
uctx->man = NULL; uctx->man = NULL;
goto out_err; goto out_err;

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

@ -1054,7 +1054,7 @@ static long vmw_generic_ioctl(struct file *filp, unsigned int cmd,
return -EINVAL; return -EINVAL;
vmaster = vmw_master_check(dev, file_priv, flags); vmaster = vmw_master_check(dev, file_priv, flags);
if (unlikely(IS_ERR(vmaster))) { if (IS_ERR(vmaster)) {
ret = PTR_ERR(vmaster); ret = PTR_ERR(vmaster);
if (ret != -ERESTARTSYS) if (ret != -ERESTARTSYS)