Clean up incorrect IS_ERR_OR_NULL() usage for functions that never
return NULL:
- r535_gsp_msgq_peek() never returns NULL
- r535_gsp_msgq_recv_one_elem() never returns NULL

These functions should be checked with IS_ERR() instead.

Signed-off-by: Hongling Zeng <[email protected]>
---
 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/rpc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/rpc.c 
b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/rpc.c
index 7dd43fa38c41..73f4aee9aa3f 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/rpc.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/rpc.c
@@ -350,7 +350,7 @@ r535_gsp_msgq_recv(struct nvkm_gsp *gsp, u32 gsp_rpc_len, 
int *retries)
                u32 size;
 
                rpc = r535_gsp_msgq_peek(gsp, sizeof(*rpc), info.retries);
-               if (IS_ERR_OR_NULL(rpc)) {
+               if (IS_ERR(rpc)) {
                        kvfree(buf);
                        return rpc;
                }
@@ -359,7 +359,7 @@ r535_gsp_msgq_recv(struct nvkm_gsp *gsp, u32 gsp_rpc_len, 
int *retries)
                info.continuation = true;
 
                rpc = r535_gsp_msgq_recv_one_elem(gsp, &info);
-               if (IS_ERR_OR_NULL(rpc)) {
+               if (IS_ERR(rpc)) {
                        kvfree(buf);
                        return rpc;
                }
@@ -494,7 +494,7 @@ r535_gsp_msg_recv(struct nvkm_gsp *gsp, int fn, u32 
gsp_rpc_len)
 
 retry:
        rpc = r535_gsp_msgq_peek(gsp, sizeof(*rpc), &retries);
-       if (IS_ERR_OR_NULL(rpc))
+       if (IS_ERR(rpc))
                return rpc;
 
        rpc = r535_gsp_msgq_recv(gsp, gsp_rpc_len, &retries);
-- 
2.25.1

Reply via email to