tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Thierry Reding and committed by
Dave Airlie ee3939e0 d3cf40ed

+20 -20
+1 -1
drivers/gpu/drm/ast/ast_drv.h
··· 362 362 { 363 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 366 if (ret) { 367 367 if (ret != -ERESTARTSYS && ret != -EBUSY) 368 368 DRM_ERROR("reserve failed %p\n", bo);
+1 -1
drivers/gpu/drm/bochs/bochs_fbdev.c
··· 72 72 73 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 76 if (ret) 77 77 return ret; 78 78
+2 -2
drivers/gpu/drm/bochs/bochs_kms.c
··· 53 53 if (old_fb) { 54 54 bochs_fb = to_bochs_framebuffer(old_fb); 55 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 57 if (ret) { 58 58 DRM_ERROR("failed to reserve old_fb bo\n"); 59 59 } else { ··· 67 67 68 68 bochs_fb = to_bochs_framebuffer(crtc->primary->fb); 69 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 71 if (ret) 72 72 return ret; 73 73
+1 -1
drivers/gpu/drm/cirrus/cirrus_drv.h
··· 241 241 { 242 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 245 if (ret) { 246 246 if (ret != -ERESTARTSYS && ret != -EBUSY) 247 247 DRM_ERROR("reserve failed %p\n", bo);
+1 -1
drivers/gpu/drm/mgag200/mgag200_drv.h
··· 280 280 { 281 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 284 if (ret) { 285 285 if (ret != -ERESTARTSYS && ret != -EBUSY) 286 286 DRM_ERROR("reserve failed %p\n", bo);
+3 -3
drivers/gpu/drm/nouveau/nouveau_bo.c
··· 309 309 struct ttm_buffer_object *bo = &nvbo->bo; 310 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 313 if (ret) 314 314 goto out; 315 315 ··· 350 350 struct ttm_buffer_object *bo = &nvbo->bo; 351 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 354 if (ret) 355 355 return ret; 356 356 ··· 385 385 { 386 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 389 if (ret) 390 390 return ret; 391 391
+2 -2
drivers/gpu/drm/nouveau/nouveau_gem.c
··· 61 61 if (!cli->base.vm) 62 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 65 if (ret) 66 66 return ret; 67 67 ··· 132 132 if (!cli->base.vm) 133 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 136 if (ret) 137 137 return; 138 138
+2 -2
drivers/gpu/drm/qxl/qxl_object.h
··· 31 31 { 32 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 35 if (unlikely(r != 0)) { 36 36 if (r != -ERESTARTSYS) { 37 37 struct qxl_device *qdev = (struct qxl_device *)bo->gem_base.dev->dev_private; ··· 67 67 { 68 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 71 if (unlikely(r != 0)) { 72 72 if (r != -ERESTARTSYS) { 73 73 struct qxl_device *qdev = (struct qxl_device *)bo->gem_base.dev->dev_private;
+3 -3
drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c
··· 61 61 62 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 65 if (unlikely(ret != 0)) 66 66 goto err; 67 67 ··· 105 105 if (pin) 106 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 109 if (unlikely(ret != 0)) 110 110 goto err; 111 111 ··· 212 212 213 213 if (pin) 214 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 216 if (unlikely(ret != 0)) 217 217 goto err_unlock; 218 218
+1 -1
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
··· 316 316 if (unlikely(ret != 0)) 317 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 320 BUG_ON(ret != 0); 321 321 322 322 ret = ttm_bo_kmap(bo, 0, 1, &map);
+2 -2
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
··· 136 136 kmap_offset = 0; 137 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 140 if (unlikely(ret != 0)) { 141 141 DRM_ERROR("reserve failed\n"); 142 142 return -EINVAL; ··· 343 343 kmap_offset = cmd->dma.guest.ptr.offset >> PAGE_SHIFT; 344 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 347 if (unlikely(ret != 0)) { 348 348 DRM_ERROR("reserve failed\n"); 349 349 return;
+1 -1
drivers/gpu/drm/vmwgfx/vmwgfx_resource.c
··· 127 127 if (res->backup) { 128 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 131 if (!list_empty(&res->mob_head) && 132 132 res->func->unbind != NULL) { 133 133 struct ttm_validate_buffer val_buf;