| Message ID | 20240419-fix-cocci-v2-23-2119e692309c@chromium.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | media: Fix coccinelle warning/errors | expand |
On 19/04/2024 10:48, Ricardo Ribalda wrote: > Unless the fps is smaller than 0.000232829 fps, this fits in a 32 bit > number. Make that explicit. > > Found by cocci: > drivers/media/platform/qcom/venus/vdec.c:488:1-7: WARNING: do_div() does a 64-by-32 division, please consider using div64_u64 instead. > > Signed-off-by: Ricardo Ribalda <ribalda@chromium.org> > --- > drivers/media/platform/qcom/venus/vdec.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c > index 29130a9441e7..2b2874aedb2d 100644 > --- a/drivers/media/platform/qcom/venus/vdec.c > +++ b/drivers/media/platform/qcom/venus/vdec.c > @@ -464,7 +464,7 @@ static int vdec_s_parm(struct file *file, void *fh, struct v4l2_streamparm *a) > struct venus_inst *inst = to_inst(file); > struct v4l2_captureparm *cap = &a->parm.capture; > struct v4l2_fract *timeperframe = &cap->timeperframe; > - u64 us_per_frame, fps; > + u64 us_per_frame; > > if (a->type != V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE && > a->type != V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) > @@ -484,10 +484,7 @@ static int vdec_s_parm(struct file *file, void *fh, struct v4l2_streamparm *a) > if (!us_per_frame) > return -EINVAL; > > - fps = (u64)USEC_PER_SEC; > - do_div(fps, us_per_frame); > - > - inst->fps = fps; > + inst->fps = USEC_PER_SEC / (u32)us_per_frame; > inst->timeperframe = *timeperframe; > > return 0; > Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
> Unless the fps is smaller than 0.000232829 fps, this fits in a 32 bit number. > Make that explicit. Would it be more appropriate to move the word “explicit” to the end of the summary phrase? Regards, Markus
diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c index 29130a9441e7..2b2874aedb2d 100644 --- a/drivers/media/platform/qcom/venus/vdec.c +++ b/drivers/media/platform/qcom/venus/vdec.c @@ -464,7 +464,7 @@ static int vdec_s_parm(struct file *file, void *fh, struct v4l2_streamparm *a) struct venus_inst *inst = to_inst(file); struct v4l2_captureparm *cap = &a->parm.capture; struct v4l2_fract *timeperframe = &cap->timeperframe; - u64 us_per_frame, fps; + u64 us_per_frame; if (a->type != V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE && a->type != V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) @@ -484,10 +484,7 @@ static int vdec_s_parm(struct file *file, void *fh, struct v4l2_streamparm *a) if (!us_per_frame) return -EINVAL; - fps = (u64)USEC_PER_SEC; - do_div(fps, us_per_frame); - - inst->fps = fps; + inst->fps = USEC_PER_SEC / (u32)us_per_frame; inst->timeperframe = *timeperframe; return 0;
Unless the fps is smaller than 0.000232829 fps, this fits in a 32 bit number. Make that explicit. Found by cocci: drivers/media/platform/qcom/venus/vdec.c:488:1-7: WARNING: do_div() does a 64-by-32 division, please consider using div64_u64 instead. Signed-off-by: Ricardo Ribalda <ribalda@chromium.org> --- drivers/media/platform/qcom/venus/vdec.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)