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

drm/vmwgfx: Replace deprecated PTR_RET

Commit 508108ea2747 ("drm/vmwgfx: Don't refcount command-buffer managed
resource lookups during command buffer validation") slips in use of
deprecated PTR_RET. Use PTR_ERR_OR_ZERO instead.

As the PTR_ERR_OR_ZERO is a bit longer than PTR_RET, we introduce
local variable ret for proper indentation and line-length limits.

Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>

authored by

Lukas Bulwahn and committed by
Thomas Hellstrom
a26ca967 36891da8

+15 -6
+15 -6
drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
··· 2377 2377 { 2378 2378 VMW_DECLARE_CMD_VAR(*cmd, SVGA3dCmdDXClearRenderTargetView) = 2379 2379 container_of(header, typeof(*cmd), header); 2380 + struct vmw_resource *ret; 2380 2381 2381 - return PTR_RET(vmw_view_id_val_add(sw_context, vmw_view_rt, 2382 - cmd->body.renderTargetViewId)); 2382 + ret = vmw_view_id_val_add(sw_context, vmw_view_rt, 2383 + cmd->body.renderTargetViewId); 2384 + 2385 + return PTR_ERR_OR_ZERO(ret); 2383 2386 } 2384 2387 2385 2388 /** ··· 2399 2396 { 2400 2397 VMW_DECLARE_CMD_VAR(*cmd, SVGA3dCmdDXClearDepthStencilView) = 2401 2398 container_of(header, typeof(*cmd), header); 2399 + struct vmw_resource *ret; 2402 2400 2403 - return PTR_RET(vmw_view_id_val_add(sw_context, vmw_view_ds, 2404 - cmd->body.depthStencilViewId)); 2401 + ret = vmw_view_id_val_add(sw_context, vmw_view_ds, 2402 + cmd->body.depthStencilViewId); 2403 + 2404 + return PTR_ERR_OR_ZERO(ret); 2405 2405 } 2406 2406 2407 2407 static int vmw_cmd_dx_view_define(struct vmw_private *dev_priv, ··· 2747 2741 { 2748 2742 VMW_DECLARE_CMD_VAR(*cmd, SVGA3dCmdDXGenMips) = 2749 2743 container_of(header, typeof(*cmd), header); 2744 + struct vmw_resource *ret; 2750 2745 2751 - return PTR_RET(vmw_view_id_val_add(sw_context, vmw_view_sr, 2752 - cmd->body.shaderResourceViewId)); 2746 + ret = vmw_view_id_val_add(sw_context, vmw_view_sr, 2747 + cmd->body.shaderResourceViewId); 2748 + 2749 + return PTR_ERR_OR_ZERO(ret); 2753 2750 } 2754 2751 2755 2752 /**