| Message ID | 20230331172423.1860083-1-trix@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/qxl: remove unused num_relocs variable | expand |
On Fri, Mar 31, 2023 at 10:24 AM Tom Rix <trix@redhat.com> wrote: > > clang with W=1 reports > drivers/gpu/drm/qxl/qxl_ioctl.c:149:14: error: variable > 'num_relocs' set but not used [-Werror,-Wunused-but-set-variable] > int i, ret, num_relocs; > ^ > This variable is not used so remove it. > > Signed-off-by: Tom Rix <trix@redhat.com> Thanks for the patch! Fixes: 74d9a6335dce ("drm/qxl: Simplify cleaning qxl processing command") Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> That commit should also have removed the label out_free_bos IMO since having two labels for the same statement is a code smell. Tom, do you mind sending a v2 with that folded in? > --- > drivers/gpu/drm/qxl/qxl_ioctl.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c > index 30f58b21372a..3422206d59d4 100644 > --- a/drivers/gpu/drm/qxl/qxl_ioctl.c > +++ b/drivers/gpu/drm/qxl/qxl_ioctl.c > @@ -146,7 +146,7 @@ static int qxl_process_single_command(struct qxl_device *qdev, > struct qxl_release *release; > struct qxl_bo *cmd_bo; > void *fb_cmd; > - int i, ret, num_relocs; > + int i, ret; > int unwritten; > > switch (cmd->type) { > @@ -201,7 +201,6 @@ static int qxl_process_single_command(struct qxl_device *qdev, > } > > /* fill out reloc info structs */ > - num_relocs = 0; > for (i = 0; i < cmd->relocs_num; ++i) { > struct drm_qxl_reloc reloc; > struct drm_qxl_reloc __user *u = u64_to_user_ptr(cmd->relocs); > @@ -231,7 +230,6 @@ static int qxl_process_single_command(struct qxl_device *qdev, > reloc_info[i].dst_bo = cmd_bo; > reloc_info[i].dst_offset = reloc.dst_offset + release->release_offset; > } > - num_relocs++; > > /* reserve and validate the reloc dst bo */ > if (reloc.reloc_type == QXL_RELOC_TYPE_BO || reloc.src_handle) { > -- > 2.27.0 >
diff --git a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c index 30f58b21372a..3422206d59d4 100644 --- a/drivers/gpu/drm/qxl/qxl_ioctl.c +++ b/drivers/gpu/drm/qxl/qxl_ioctl.c @@ -146,7 +146,7 @@ static int qxl_process_single_command(struct qxl_device *qdev, struct qxl_release *release; struct qxl_bo *cmd_bo; void *fb_cmd; - int i, ret, num_relocs; + int i, ret; int unwritten; switch (cmd->type) { @@ -201,7 +201,6 @@ static int qxl_process_single_command(struct qxl_device *qdev, } /* fill out reloc info structs */ - num_relocs = 0; for (i = 0; i < cmd->relocs_num; ++i) { struct drm_qxl_reloc reloc; struct drm_qxl_reloc __user *u = u64_to_user_ptr(cmd->relocs); @@ -231,7 +230,6 @@ static int qxl_process_single_command(struct qxl_device *qdev, reloc_info[i].dst_bo = cmd_bo; reloc_info[i].dst_offset = reloc.dst_offset + release->release_offset; } - num_relocs++; /* reserve and validate the reloc dst bo */ if (reloc.reloc_type == QXL_RELOC_TYPE_BO || reloc.src_handle) {
clang with W=1 reports drivers/gpu/drm/qxl/qxl_ioctl.c:149:14: error: variable 'num_relocs' set but not used [-Werror,-Wunused-but-set-variable] int i, ret, num_relocs; ^ This variable is not used so remove it. Signed-off-by: Tom Rix <trix@redhat.com> --- drivers/gpu/drm/qxl/qxl_ioctl.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)