diff options
| author | Viresh Kumar | 2015-07-31 10:38:24 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2015-08-06 14:13:07 +0200 |
| commit | 55579cfe67d76394be46f00acef8854d08db5362 (patch) | |
| tree | fc1be44ac3af74fc0625aebb7ad88dccc1c7faa2 /drivers/gpu/drm/ttm | |
| parent | drm/virtio: Use new drm_fb_helper functions (diff) | |
| download | kernel-qcow2-linux-55579cfe67d76394be46f00acef8854d08db5362.tar.gz kernel-qcow2-linux-55579cfe67d76394be46f00acef8854d08db5362.tar.xz kernel-qcow2-linux-55579cfe67d76394be46f00acef8854d08db5362.zip | |
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>
Diffstat (limited to 'drivers/gpu/drm/ttm')
| -rw-r--r-- | drivers/gpu/drm/ttm/ttm_tt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c index bf080abc86d1..4e19d0f9cc30 100644 --- 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; } |