lkml.org 
[lkml]   [2015]   [Jul]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 04/15] drivers: gpu: Drop unlikely before IS_ERR(_OR_NULL)
    Date
    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>
    ---
    drivers/gpu/drm/ttm/ttm_tt.c | 4 ++--
    drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 2 +-
    drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 +-
    3 files changed, 4 insertions(+), 4 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;
    }
    diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_context.c b/drivers/gpu/drm/vmwgfx/vmwgfx_context.c
    index 5ac92874404d..44e6ecba3de7 100644
    --- a/drivers/gpu/drm/vmwgfx/vmwgfx_context.c
    +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_context.c
    @@ -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;
    diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
    index 620bb5cf617c..6218a36cf01a 100644
    --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
    +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
    @@ -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)
    --
    2.4.0


    \
     
     \ /
      Last update: 2015-07-31 10:41    [W:7.140 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site