diff options
author | Thierry Reding <treding@nvidia.com> | 2014-07-21 07:15:51 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2014-07-21 20:58:21 -0400 |
commit | ee3939e07920f4a5405aba5f40529fd0fdd1dfb5 (patch) | |
tree | 911e7463ed10512cb32346fd4004c48164910eb3 | |
parent | d3cf40ed7fa1b56bd53d3b52eddf44d0e3c3ec20 (diff) |
drm/ttm: Fix a few sparse warnings
The final parameter to ttm_bo_reserve() is a pointer, therefore callers
should use NULL instead of 0.
Fixes a bunch of sparse warnings of this type:
warning: Using plain integer as NULL pointer
Signed-off-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r-- | drivers/gpu/drm/ast/ast_drv.h | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/bochs/bochs_fbdev.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/bochs/bochs_kms.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/cirrus/cirrus_drv.h | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/mgag200/mgag200_drv.h | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_bo.c | 6 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_gem.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/qxl/qxl_object.h | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c | 6 | ||||
-rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 2 |
12 files changed, 20 insertions, 20 deletions
diff --git a/drivers/gpu/drm/ast/ast_drv.h b/drivers/gpu/drm/ast/ast_drv.h index 5d6a87573c33..957d4fabf1e1 100644 --- a/drivers/gpu/drm/ast/ast_drv.h +++ b/drivers/gpu/drm/ast/ast_drv.h | |||
@@ -362,7 +362,7 @@ static inline int ast_bo_reserve(struct ast_bo *bo, bool no_wait) | |||
362 | { | 362 | { |
363 | int ret; | 363 | int ret; |
364 | 364 | ||
365 | ret = ttm_bo_reserve(&bo->bo, true, no_wait, false, 0); | 365 | ret = ttm_bo_reserve(&bo->bo, true, no_wait, false, NULL); |
366 | if (ret) { | 366 | if (ret) { |
367 | if (ret != -ERESTARTSYS && ret != -EBUSY) | 367 | if (ret != -ERESTARTSYS && ret != -EBUSY) |
368 | DRM_ERROR("reserve failed %p\n", bo); | 368 | DRM_ERROR("reserve failed %p\n", bo); |
diff --git a/drivers/gpu/drm/bochs/bochs_fbdev.c b/drivers/gpu/drm/bochs/bochs_fbdev.c index 19cf3e9413b6..fe95d31cd110 100644 --- a/drivers/gpu/drm/bochs/bochs_fbdev.c +++ b/drivers/gpu/drm/bochs/bochs_fbdev.c | |||
@@ -72,7 +72,7 @@ static int bochsfb_create(struct drm_fb_helper *helper, | |||
72 | 72 | ||
73 | bo = gem_to_bochs_bo(gobj); | 73 | bo = gem_to_bochs_bo(gobj); |
74 | 74 | ||
75 | ret = ttm_bo_reserve(&bo->bo, true, false, false, 0); | 75 | ret = ttm_bo_reserve(&bo->bo, true, false, false, NULL); |
76 | if (ret) | 76 | if (ret) |
77 | return ret; | 77 | return ret; |
78 | 78 | ||
diff --git a/drivers/gpu/drm/bochs/bochs_kms.c b/drivers/gpu/drm/bochs/bochs_kms.c index b3c61307093e..9d7346b92653 100644 --- a/drivers/gpu/drm/bochs/bochs_kms.c +++ b/drivers/gpu/drm/bochs/bochs_kms.c | |||
@@ -53,7 +53,7 @@ static int bochs_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y, | |||
53 | if (old_fb) { | 53 | if (old_fb) { |
54 | bochs_fb = to_bochs_framebuffer(old_fb); | 54 | bochs_fb = to_bochs_framebuffer(old_fb); |
55 | bo = gem_to_bochs_bo(bochs_fb->obj); | 55 | bo = gem_to_bochs_bo(bochs_fb->obj); |
56 | ret = ttm_bo_reserve(&bo->bo, true, false, false, 0); | 56 | ret = ttm_bo_reserve(&bo->bo, true, false, false, NULL); |
57 | if (ret) { | 57 | if (ret) { |
58 | DRM_ERROR("failed to reserve old_fb bo\n"); | 58 | DRM_ERROR("failed to reserve old_fb bo\n"); |
59 | } else { | 59 | } else { |
@@ -67,7 +67,7 @@ static int bochs_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y, | |||
67 | 67 | ||
68 | bochs_fb = to_bochs_framebuffer(crtc->primary->fb); | 68 | bochs_fb = to_bochs_framebuffer(crtc->primary->fb); |
69 | bo = gem_to_bochs_bo(bochs_fb->obj); | 69 | bo = gem_to_bochs_bo(bochs_fb->obj); |
70 | ret = ttm_bo_reserve(&bo->bo, true, false, false, 0); | 70 | ret = ttm_bo_reserve(&bo->bo, true, false, false, NULL); |
71 | if (ret) | 71 | if (ret) |
72 | return ret; | 72 | return ret; |
73 | 73 | ||
diff --git a/drivers/gpu/drm/cirrus/cirrus_drv.h b/drivers/gpu/drm/cirrus/cirrus_drv.h index 117d3eca5e37..401c890b6c6a 100644 --- a/drivers/gpu/drm/cirrus/cirrus_drv.h +++ b/drivers/gpu/drm/cirrus/cirrus_drv.h | |||
@@ -241,7 +241,7 @@ static inline int cirrus_bo_reserve(struct cirrus_bo *bo, bool no_wait) | |||
241 | { | 241 | { |
242 | int ret; | 242 | int ret; |
243 | 243 | ||
244 | ret = ttm_bo_reserve(&bo->bo, true, no_wait, false, 0); | 244 | ret = ttm_bo_reserve(&bo->bo, true, no_wait, false, NULL); |
245 | if (ret) { | 245 | if (ret) { |
246 | if (ret != -ERESTARTSYS && ret != -EBUSY) | 246 | if (ret != -ERESTARTSYS && ret != -EBUSY) |
247 | DRM_ERROR("reserve failed %p\n", bo); | 247 | DRM_ERROR("reserve failed %p\n", bo); |
diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.h b/drivers/gpu/drm/mgag200/mgag200_drv.h index cf11ee68a6d9..80de23d9b9c9 100644 --- a/drivers/gpu/drm/mgag200/mgag200_drv.h +++ b/drivers/gpu/drm/mgag200/mgag200_drv.h | |||
@@ -280,7 +280,7 @@ static inline int mgag200_bo_reserve(struct mgag200_bo *bo, bool no_wait) | |||
280 | { | 280 | { |
281 | int ret; | 281 | int ret; |
282 | 282 | ||
283 | ret = ttm_bo_reserve(&bo->bo, true, no_wait, false, 0); | 283 | ret = ttm_bo_reserve(&bo->bo, true, no_wait, false, NULL); |
284 | if (ret) { | 284 | if (ret) { |
285 | if (ret != -ERESTARTSYS && ret != -EBUSY) | 285 | if (ret != -ERESTARTSYS && ret != -EBUSY) |
286 | DRM_ERROR("reserve failed %p\n", bo); | 286 | DRM_ERROR("reserve failed %p\n", bo); |
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index b6dc85c614be..ba29a701ca1d 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c | |||
@@ -309,7 +309,7 @@ nouveau_bo_pin(struct nouveau_bo *nvbo, uint32_t memtype) | |||
309 | struct ttm_buffer_object *bo = &nvbo->bo; | 309 | struct ttm_buffer_object *bo = &nvbo->bo; |
310 | int ret; | 310 | int ret; |
311 | 311 | ||
312 | ret = ttm_bo_reserve(bo, false, false, false, 0); | 312 | ret = ttm_bo_reserve(bo, false, false, false, NULL); |
313 | if (ret) | 313 | if (ret) |
314 | goto out; | 314 | goto out; |
315 | 315 | ||
@@ -350,7 +350,7 @@ nouveau_bo_unpin(struct nouveau_bo *nvbo) | |||
350 | struct ttm_buffer_object *bo = &nvbo->bo; | 350 | struct ttm_buffer_object *bo = &nvbo->bo; |
351 | int ret, ref; | 351 | int ret, ref; |
352 | 352 | ||
353 | ret = ttm_bo_reserve(bo, false, false, false, 0); | 353 | ret = ttm_bo_reserve(bo, false, false, false, NULL); |
354 | if (ret) | 354 | if (ret) |
355 | return ret; | 355 | return ret; |
356 | 356 | ||
@@ -385,7 +385,7 @@ nouveau_bo_map(struct nouveau_bo *nvbo) | |||
385 | { | 385 | { |
386 | int ret; | 386 | int ret; |
387 | 387 | ||
388 | ret = ttm_bo_reserve(&nvbo->bo, false, false, false, 0); | 388 | ret = ttm_bo_reserve(&nvbo->bo, false, false, false, NULL); |
389 | if (ret) | 389 | if (ret) |
390 | return ret; | 390 | return ret; |
391 | 391 | ||
diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c index c90c0dc0afe8..df9d451afdcd 100644 --- a/drivers/gpu/drm/nouveau/nouveau_gem.c +++ b/drivers/gpu/drm/nouveau/nouveau_gem.c | |||
@@ -61,7 +61,7 @@ nouveau_gem_object_open(struct drm_gem_object *gem, struct drm_file *file_priv) | |||
61 | if (!cli->base.vm) | 61 | if (!cli->base.vm) |
62 | return 0; | 62 | return 0; |
63 | 63 | ||
64 | ret = ttm_bo_reserve(&nvbo->bo, false, false, false, 0); | 64 | ret = ttm_bo_reserve(&nvbo->bo, false, false, false, NULL); |
65 | if (ret) | 65 | if (ret) |
66 | return ret; | 66 | return ret; |
67 | 67 | ||
@@ -132,7 +132,7 @@ nouveau_gem_object_close(struct drm_gem_object *gem, struct drm_file *file_priv) | |||
132 | if (!cli->base.vm) | 132 | if (!cli->base.vm) |
133 | return; | 133 | return; |
134 | 134 | ||
135 | ret = ttm_bo_reserve(&nvbo->bo, false, false, false, 0); | 135 | ret = ttm_bo_reserve(&nvbo->bo, false, false, false, NULL); |
136 | if (ret) | 136 | if (ret) |
137 | return; | 137 | return; |
138 | 138 | ||
diff --git a/drivers/gpu/drm/qxl/qxl_object.h b/drivers/gpu/drm/qxl/qxl_object.h index d458a140c024..83a423293afd 100644 --- a/drivers/gpu/drm/qxl/qxl_object.h +++ b/drivers/gpu/drm/qxl/qxl_object.h | |||
@@ -31,7 +31,7 @@ static inline int qxl_bo_reserve(struct qxl_bo *bo, bool no_wait) | |||
31 | { | 31 | { |
32 | int r; | 32 | int r; |
33 | 33 | ||
34 | r = ttm_bo_reserve(&bo->tbo, true, no_wait, false, 0); | 34 | r = ttm_bo_reserve(&bo->tbo, true, no_wait, false, NULL); |
35 | if (unlikely(r != 0)) { | 35 | if (unlikely(r != 0)) { |
36 | if (r != -ERESTARTSYS) { | 36 | if (r != -ERESTARTSYS) { |
37 | struct qxl_device *qdev = (struct qxl_device *)bo->gem_base.dev->dev_private; | 37 | struct qxl_device *qdev = (struct qxl_device *)bo->gem_base.dev->dev_private; |
@@ -67,7 +67,7 @@ static inline int qxl_bo_wait(struct qxl_bo *bo, u32 *mem_type, | |||
67 | { | 67 | { |
68 | int r; | 68 | int r; |
69 | 69 | ||
70 | r = ttm_bo_reserve(&bo->tbo, true, no_wait, false, 0); | 70 | r = ttm_bo_reserve(&bo->tbo, true, no_wait, false, NULL); |
71 | if (unlikely(r != 0)) { | 71 | if (unlikely(r != 0)) { |
72 | if (r != -ERESTARTSYS) { | 72 | if (r != -ERESTARTSYS) { |
73 | struct qxl_device *qdev = (struct qxl_device *)bo->gem_base.dev->dev_private; | 73 | struct qxl_device *qdev = (struct qxl_device *)bo->gem_base.dev->dev_private; |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c index 70ddce8358b0..ed1d51006ab1 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c | |||
@@ -61,7 +61,7 @@ int vmw_dmabuf_to_placement(struct vmw_private *dev_priv, | |||
61 | 61 | ||
62 | vmw_execbuf_release_pinned_bo(dev_priv); | 62 | vmw_execbuf_release_pinned_bo(dev_priv); |
63 | 63 | ||
64 | ret = ttm_bo_reserve(bo, interruptible, false, false, 0); | 64 | ret = ttm_bo_reserve(bo, interruptible, false, false, NULL); |
65 | if (unlikely(ret != 0)) | 65 | if (unlikely(ret != 0)) |
66 | goto err; | 66 | goto err; |
67 | 67 | ||
@@ -105,7 +105,7 @@ int vmw_dmabuf_to_vram_or_gmr(struct vmw_private *dev_priv, | |||
105 | if (pin) | 105 | if (pin) |
106 | vmw_execbuf_release_pinned_bo(dev_priv); | 106 | vmw_execbuf_release_pinned_bo(dev_priv); |
107 | 107 | ||
108 | ret = ttm_bo_reserve(bo, interruptible, false, false, 0); | 108 | ret = ttm_bo_reserve(bo, interruptible, false, false, NULL); |
109 | if (unlikely(ret != 0)) | 109 | if (unlikely(ret != 0)) |
110 | goto err; | 110 | goto err; |
111 | 111 | ||
@@ -212,7 +212,7 @@ int vmw_dmabuf_to_start_of_vram(struct vmw_private *dev_priv, | |||
212 | 212 | ||
213 | if (pin) | 213 | if (pin) |
214 | vmw_execbuf_release_pinned_bo(dev_priv); | 214 | vmw_execbuf_release_pinned_bo(dev_priv); |
215 | ret = ttm_bo_reserve(bo, interruptible, false, false, 0); | 215 | ret = ttm_bo_reserve(bo, interruptible, false, false, NULL); |
216 | if (unlikely(ret != 0)) | 216 | if (unlikely(ret != 0)) |
217 | goto err_unlock; | 217 | goto err_unlock; |
218 | 218 | ||
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index f31a75494e07..18b54acacfbb 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | |||
@@ -316,7 +316,7 @@ static int vmw_dummy_query_bo_create(struct vmw_private *dev_priv) | |||
316 | if (unlikely(ret != 0)) | 316 | if (unlikely(ret != 0)) |
317 | return ret; | 317 | return ret; |
318 | 318 | ||
319 | ret = ttm_bo_reserve(bo, false, true, false, 0); | 319 | ret = ttm_bo_reserve(bo, false, true, false, NULL); |
320 | BUG_ON(ret != 0); | 320 | BUG_ON(ret != 0); |
321 | 321 | ||
322 | ret = ttm_bo_kmap(bo, 0, 1, &map); | 322 | ret = ttm_bo_kmap(bo, 0, 1, &map); |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c index 991e5c8676f1..d2bc2b03d4c6 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | |||
@@ -136,7 +136,7 @@ int vmw_cursor_update_dmabuf(struct vmw_private *dev_priv, | |||
136 | kmap_offset = 0; | 136 | kmap_offset = 0; |
137 | kmap_num = (width*height*4 + PAGE_SIZE - 1) >> PAGE_SHIFT; | 137 | kmap_num = (width*height*4 + PAGE_SIZE - 1) >> PAGE_SHIFT; |
138 | 138 | ||
139 | ret = ttm_bo_reserve(&dmabuf->base, true, false, false, 0); | 139 | ret = ttm_bo_reserve(&dmabuf->base, true, false, false, NULL); |
140 | if (unlikely(ret != 0)) { | 140 | if (unlikely(ret != 0)) { |
141 | DRM_ERROR("reserve failed\n"); | 141 | DRM_ERROR("reserve failed\n"); |
142 | return -EINVAL; | 142 | return -EINVAL; |
@@ -343,7 +343,7 @@ void vmw_kms_cursor_snoop(struct vmw_surface *srf, | |||
343 | kmap_offset = cmd->dma.guest.ptr.offset >> PAGE_SHIFT; | 343 | kmap_offset = cmd->dma.guest.ptr.offset >> PAGE_SHIFT; |
344 | kmap_num = (64*64*4) >> PAGE_SHIFT; | 344 | kmap_num = (64*64*4) >> PAGE_SHIFT; |
345 | 345 | ||
346 | ret = ttm_bo_reserve(bo, true, false, false, 0); | 346 | ret = ttm_bo_reserve(bo, true, false, false, NULL); |
347 | if (unlikely(ret != 0)) { | 347 | if (unlikely(ret != 0)) { |
348 | DRM_ERROR("reserve failed\n"); | 348 | DRM_ERROR("reserve failed\n"); |
349 | return; | 349 | return; |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c index 01d68f0a69dc..a432c0db257c 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | |||
@@ -127,7 +127,7 @@ static void vmw_resource_release(struct kref *kref) | |||
127 | if (res->backup) { | 127 | if (res->backup) { |
128 | struct ttm_buffer_object *bo = &res->backup->base; | 128 | struct ttm_buffer_object *bo = &res->backup->base; |
129 | 129 | ||
130 | ttm_bo_reserve(bo, false, false, false, 0); | 130 | ttm_bo_reserve(bo, false, false, false, NULL); |
131 | if (!list_empty(&res->mob_head) && | 131 | if (!list_empty(&res->mob_head) && |
132 | res->func->unbind != NULL) { | 132 | res->func->unbind != NULL) { |
133 | struct ttm_validate_buffer val_buf; | 133 | struct ttm_validate_buffer val_buf; |