[PATCH v1] drm/nouveau/nvkm: Convert to use ERR_CAST()
From: Chen Yufan
Date: Thu Sep 05 2024 - 06:27:24 EST
Instead of directly casting and returning (void *) pointer, use ERR_CAST
to explicitly return an error-valued pointer. This makes the error handling
more explicit and improves code clarity.
Signed-off-by: Chen Yufan <chenyufan@xxxxxxxx>
---
drivers/gpu/drm/nouveau/nvkm/engine/disp/r535.c | 2 +-
drivers/gpu/drm/nouveau/nvkm/engine/dma/user.c | 2 +-
drivers/gpu/drm/nouveau/nvkm/subdev/mmu/uvmm.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/r535.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/r535.c
index 027867c2a8c5..266857ace7c7 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/r535.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/r535.c
@@ -646,7 +646,7 @@ r535_conn_new(struct nvkm_disp *disp, u32 id)
ctrl = nvkm_gsp_rm_ctrl_get(&disp->rm.objcom,
NV0073_CTRL_CMD_SPECIFIC_GET_CONNECTOR_DATA, sizeof(*ctrl));
if (IS_ERR(ctrl))
- return (void *)ctrl;
+ return ERR_CAST(ctrl);
ctrl->subDeviceInstance = 0;
ctrl->displayId = BIT(id);
diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/dma/user.c b/drivers/gpu/drm/nouveau/nvkm/engine/dma/user.c
index 797131ed7d67..ef02e61dda0c 100644
--- a/drivers/gpu/drm/nouveau/nvkm/engine/dma/user.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/dma/user.c
@@ -38,7 +38,7 @@ nvkm_dmaobj_search(struct nvkm_client *client, u64 handle)
object = nvkm_object_search(client, handle, &nvkm_dmaobj_func);
if (IS_ERR(object))
- return (void *)object;
+ return ERR_CAST(object);
return nvkm_dmaobj(object);
}
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/uvmm.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/uvmm.c
index cf490ff2b9f1..c45914f30c3d 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/uvmm.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/uvmm.c
@@ -37,7 +37,7 @@ nvkm_uvmm_search(struct nvkm_client *client, u64 handle)
object = nvkm_object_search(client, handle, &nvkm_uvmm);
if (IS_ERR(object))
- return (void *)object;
+ return ERR_CAST(object);
return nvkm_vmm_ref(nvkm_uvmm(object)->vmm);
}
--
2.39.0