Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55579cfe authored Jul 31, 2015 by Viresh Kumar Committed by Daniel Vetter Aug 06, 2015

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>

parent 0843010b

drivers/gpu/drm/ttm/ttm_tt.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}

drivers/gpu/drm/vmwgfx/vmwgfx_context.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)