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

Commit 772b5408 authored by Chengguang Xu's avatar Chengguang Xu Committed by Chris Wilson
Browse files

drm/i915: remove redundant likely/unlikely annotation 



unlikely has already included in IS_ERR(), so just
remove redundant likely/unlikely annotation.

Signed-off-by: default avatarChengguang Xu <cgxu519@gmx.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190221020819.21832-1-cgxu519@gmx.com
parent 43a8f684

drivers/gpu/drm/i915/i915_gem.c

+2 −2
Original line number Diff line number Diff line
@@ -2409,7 +2409,7 @@ static int i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj) 
		do {

			cond_resched();

			page = shmem_read_mapping_page_gfp(mapping, i, gfp);

			if (likely(!IS_ERR(page)))

			if (!IS_ERR(page))

				break;



			if (!*s) {
@@ -3884,7 +3884,7 @@ i915_gem_object_ggtt_pin(struct drm_i915_gem_object *obj, 
	}



	vma = i915_vma_instance(obj, vm, view);

	if (unlikely(IS_ERR(vma)))

	if (IS_ERR(vma))

		return vma;



	if (i915_vma_misplaced(vma, size, alignment, flags)) {

drivers/gpu/drm/i915/i915_gem_execbuffer.c

+1 −1
Original line number Diff line number Diff line
@@ -849,7 +849,7 @@ static int eb_lookup_vmas(struct i915_execbuffer *eb) 
		}



		vma = i915_vma_instance(obj, eb->vm, NULL);

		if (unlikely(IS_ERR(vma))) {

		if (IS_ERR(vma)) {

			err = PTR_ERR(vma);

			goto err_obj;

		}

drivers/gpu/drm/i915/i915_gem_gtt.c

+1 −1
Original line number Diff line number Diff line
@@ -3701,7 +3701,7 @@ i915_get_ggtt_vma_pages(struct i915_vma *vma) 
	}



	ret = 0;

	if (unlikely(IS_ERR(vma->pages))) {

	if (IS_ERR(vma->pages)) {

		ret = PTR_ERR(vma->pages);

		vma->pages = NULL;

		DRM_ERROR("Failed to get pages for VMA view type %u (%d)!\n",