UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/i915: remove redundant likely/unlikely annotation 

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

Signed-off-by: Chengguang Xu <cgxu519@gmx.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190221020819.21832-1-cgxu519@gmx.com
This commit is contained in:
Chengguang Xu 2019-02-21 10:08:19 +08:00 committed by Chris Wilson
parent 43a8f684b6
commit 772b5408e3
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/i915/i915_gem.c
View File

@ -2409,7 +2409,7 @@ rebuild_st:
do { do {
cond_resched(); cond_resched();
page = shmem_read_mapping_page_gfp(mapping, i, gfp); page = shmem_read_mapping_page_gfp(mapping, i, gfp);
if (likely(!IS_ERR(page))) if (!IS_ERR(page))
break; break;
if (!*s) { if (!*s) {
@ -3884,7 +3884,7 @@ i915_gem_object_ggtt_pin(struct drm_i915_gem_object *obj,
} }
vma = i915_vma_instance(obj, vm, view); vma = i915_vma_instance(obj, vm, view);
if (unlikely(IS_ERR(vma))) if (IS_ERR(vma))
return vma; return vma;
if (i915_vma_misplaced(vma, size, alignment, flags)) { if (i915_vma_misplaced(vma, size, alignment, flags)) {

2
drivers/gpu/drm/i915/i915_gem_execbuffer.c
View File

@ -849,7 +849,7 @@ static int eb_lookup_vmas(struct i915_execbuffer *eb)
} }
vma = i915_vma_instance(obj, eb->vm, NULL); vma = i915_vma_instance(obj, eb->vm, NULL);
if (unlikely(IS_ERR(vma))) { if (IS_ERR(vma)) {
err = PTR_ERR(vma); err = PTR_ERR(vma);
goto err_obj; goto err_obj;
} }

2
drivers/gpu/drm/i915/i915_gem_gtt.c
View File

@ -3701,7 +3701,7 @@ i915_get_ggtt_vma_pages(struct i915_vma *vma)
} }
ret = 0; ret = 0;
if (unlikely(IS_ERR(vma->pages))) { if (IS_ERR(vma->pages)) {
ret = PTR_ERR(vma->pages); ret = PTR_ERR(vma->pages);
vma->pages = NULL; vma->pages = NULL;
DRM_ERROR("Failed to get pages for VMA view type %u (%d)!\n", DRM_ERROR("Failed to get pages for VMA view type %u (%d)!\n",