Skip to content

Commit

Permalink
ttm: use NULL instead of 0 for ttm_bo_reserve()'s pointer arg.
Browse files Browse the repository at this point in the history
Fix a sparse warning: ttm_bo_reserve()'s last argument is a
pointer to a struct, so use NULL as nullpointer.

Signed-off-by: Martin Kepplinger <[email protected]>
Reviewed-by: Jingoo Han <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
  • Loading branch information
merge authored and airlied committed Jul 8, 2014
1 parent 2023d84 commit 0eff2a2
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions drivers/gpu/drm/ttm/ttm_bo.c
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ static void ttm_bo_cleanup_refs_or_queue(struct ttm_buffer_object *bo)
int ret;

spin_lock(&glob->lru_lock);
ret = __ttm_bo_reserve(bo, false, true, false, 0);
ret = __ttm_bo_reserve(bo, false, true, false, NULL);

spin_lock(&bdev->fence_lock);
(void) ttm_bo_wait(bo, false, false, true);
Expand Down Expand Up @@ -514,7 +514,7 @@ static int ttm_bo_cleanup_refs_and_unlock(struct ttm_buffer_object *bo,
return ret;

spin_lock(&glob->lru_lock);
ret = __ttm_bo_reserve(bo, false, true, false, 0);
ret = __ttm_bo_reserve(bo, false, true, false, NULL);

/*
* We raced, and lost, someone else holds the reservation now,
Expand Down Expand Up @@ -577,11 +577,11 @@ static int ttm_bo_delayed_delete(struct ttm_bo_device *bdev, bool remove_all)
kref_get(&nentry->list_kref);
}

ret = __ttm_bo_reserve(entry, false, true, false, 0);
ret = __ttm_bo_reserve(entry, false, true, false, NULL);
if (remove_all && ret) {
spin_unlock(&glob->lru_lock);
ret = __ttm_bo_reserve(entry, false, false,
false, 0);
false, NULL);
spin_lock(&glob->lru_lock);
}

Expand Down Expand Up @@ -726,7 +726,7 @@ static int ttm_mem_evict_first(struct ttm_bo_device *bdev,

spin_lock(&glob->lru_lock);
list_for_each_entry(bo, &man->lru, lru) {
ret = __ttm_bo_reserve(bo, false, true, false, 0);
ret = __ttm_bo_reserve(bo, false, true, false, NULL);
if (!ret)
break;
}
Expand Down Expand Up @@ -1595,7 +1595,7 @@ int ttm_bo_synccpu_write_grab(struct ttm_buffer_object *bo, bool no_wait)
* Using ttm_bo_reserve makes sure the lru lists are updated.
*/

ret = ttm_bo_reserve(bo, true, no_wait, false, 0);
ret = ttm_bo_reserve(bo, true, no_wait, false, NULL);
if (unlikely(ret != 0))
return ret;
spin_lock(&bdev->fence_lock);
Expand Down Expand Up @@ -1630,7 +1630,7 @@ static int ttm_bo_swapout(struct ttm_mem_shrink *shrink)

spin_lock(&glob->lru_lock);
list_for_each_entry(bo, &glob->swap_lru, swap) {
ret = __ttm_bo_reserve(bo, false, true, false, 0);
ret = __ttm_bo_reserve(bo, false, true, false, NULL);
if (!ret)
break;
}
Expand Down

0 comments on commit 0eff2a2

Please sign in to comment.