Skip to contentSkip to conversation

drm/vmwgfx: Replace PTR_RET with PTR_ERR_OR_ZERO

PATCH New Gustavo A. R. Silva 1 participant 1 message Jan 23, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/vmwgfx: Replace PTR_RET with PTR_ERR_OR_ZERO

PTR_RET is deprecated and will be removed soon.

Use PTR_ERR_OR_ZERO instead.

Notice that these are the last instances of PTR_RET in the whole codebase.

---
 drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +3 -3
index f2d13a72c05d..137cb1a4d6b0 100644
@@ -2521,7 +2521,7 @@ static int vmw_cmd_dx_clear_rendertarget_view(struct vmw_private *dev_priv,
 		SVGA3dCmdDXClearRenderTargetView body;
 	} *cmd = container_of(header, typeof(*cmd), header);
 
-	return PTR_RET(vmw_view_id_val_add(sw_context, vmw_view_rt,
+	return PTR_ERR_OR_ZERO(vmw_view_id_val_add(sw_context, vmw_view_rt,
 					   cmd->body.renderTargetViewId));
 }
 
@@ -2542,7 +2542,7 @@ static int vmw_cmd_dx_clear_depthstencil_view(struct vmw_private *dev_priv,
 		SVGA3dCmdDXClearDepthStencilView body;
 	} *cmd = container_of(header, typeof(*cmd), header);
 
-	return PTR_RET(vmw_view_id_val_add(sw_context, vmw_view_ds,
+	return PTR_ERR_OR_ZERO(vmw_view_id_val_add(sw_context, vmw_view_ds,
 					   cmd->body.depthStencilViewId));
 }
 
@@ -2916,7 +2916,7 @@ static int vmw_cmd_dx_genmips(struct vmw_private *dev_priv,
 		SVGA3dCmdDXGenMips body;
 	} *cmd = container_of(header, typeof(*cmd), header);
 
-	return PTR_RET(vmw_view_id_val_add(sw_context, vmw_view_sr,
+	return PTR_ERR_OR_ZERO(vmw_view_id_val_add(sw_context, vmw_view_sr,
 					   cmd->body.shaderResourceViewId));
 }
 
Signature · 1 line
2.20.1