if (1) always evaluates to true. Remove the unneeded check.
Signed-off-by: Ethan Carter Edwards <ethan@xxxxxxxxxxxxxxxxx>
---
.../gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/fifo.c | 36 ++++++++++------------
1 file changed, 16 insertions(+), 20 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/fifo.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/fifo.c
index 1ac5628c5140e66d306a1aadce10c810886afad3..104c72ec359a07a318ac99f5c217f0b07db2b784 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/fifo.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/fifo.c
@@ -188,32 +188,28 @@ r535_chan_ramfc_write(struct nvkm_chan *chan, u64 offset, u64 length, u32 devm,
if (ret)
return ret;
- if (1) {
- NVA06F_CTRL_GPFIFO_SCHEDULE_PARAMS *ctrl;
+ NVA06F_CTRL_GPFIFO_SCHEDULE_PARAMS *ctrl;
- if (1) {
- NVA06F_CTRL_BIND_PARAMS *ctrl;
+ NVA06F_CTRL_BIND_PARAMS *ctrl;
- ctrl = nvkm_gsp_rm_ctrl_get(&chan->rm.object,
- NVA06F_CTRL_CMD_BIND, sizeof(*ctrl));
- if (WARN_ON(IS_ERR(ctrl)))
- return PTR_ERR(ctrl);
+ ctrl = nvkm_gsp_rm_ctrl_get(&chan->rm.object,
+ NVA06F_CTRL_CMD_BIND, sizeof(*ctrl));
+ if (WARN_ON(IS_ERR(ctrl)))
+ return PTR_ERR(ctrl);
- ctrl->engineType = eT;
+ ctrl->engineType = eT;
- ret = nvkm_gsp_rm_ctrl_wr(&chan->rm.object, ctrl);
- if (ret)
- return ret;
- }
+ ret = nvkm_gsp_rm_ctrl_wr(&chan->rm.object, ctrl);
+ if (ret)
+ return ret;
- ctrl = nvkm_gsp_rm_ctrl_get(&chan->rm.object,
- NVA06F_CTRL_CMD_GPFIFO_SCHEDULE, sizeof(*ctrl));
- if (WARN_ON(IS_ERR(ctrl)))
- return PTR_ERR(ctrl);
+ ctrl = nvkm_gsp_rm_ctrl_get(&chan->rm.object,
+ NVA06F_CTRL_CMD_GPFIFO_SCHEDULE, sizeof(*ctrl));
+ if (WARN_ON(IS_ERR(ctrl)))
+ return PTR_ERR(ctrl);
- ctrl->bEnable = 1;
- ret = nvkm_gsp_rm_ctrl_wr(&chan->rm.object, ctrl);
- }
+ ctrl->bEnable = 1;
+ ret = nvkm_gsp_rm_ctrl_wr(&chan->rm.object, ctrl);
return ret;
}
---
base-commit: b9ddaa95fd283bce7041550ddbbe7e764c477110
change-id: 20250801-nouveau-fifo-635c63f77cae
Best regards,
--
Ethan Carter Edwards <ethan@xxxxxxxxxxxxxxxxx>
