| Message ID | 20240415-fix-cocci-v1-19-477afb23728b@chromium.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | media: Fix coccinelle warning/errors | expand |
On 15/04/2024 20:34, Ricardo Ribalda wrote: > Simplifies the code. > > Found by cocci: > drivers/media/usb/stk1160/stk1160-video.c:133:12-13: WARNING opportunity for min() > drivers/media/usb/stk1160/stk1160-video.c:176:13-14: WARNING opportunity for min() > > Signed-off-by: Ricardo Ribalda <ribalda@chromium.org> Show the commit log some love, then add Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> For patches 16 through 19. --- bod
diff --git a/drivers/media/usb/stk1160/stk1160-video.c b/drivers/media/usb/stk1160/stk1160-video.c index 366f0e4a5dc0..0ba0f41fe3f4 100644 --- a/drivers/media/usb/stk1160/stk1160-video.c +++ b/drivers/media/usb/stk1160/stk1160-video.c @@ -130,10 +130,7 @@ void stk1160_copy_video(struct stk1160 *dev, u8 *src, int len) dst += linesdone * bytesperline * 2 + lineoff; /* Copy the remaining of current line */ - if (remain < (bytesperline - lineoff)) - lencopy = remain; - else - lencopy = bytesperline - lineoff; + lencopy = min(remain, bytesperline - lineoff); /* * Check if we have enough space left in the buffer. @@ -173,10 +170,7 @@ void stk1160_copy_video(struct stk1160 *dev, u8 *src, int len) src += lencopy; /* Copy one line at a time */ - if (remain < bytesperline) - lencopy = remain; - else - lencopy = bytesperline; + lencopy = min(remain, bytesperline); /* * Check if we have enough space left in the buffer.
Simplifies the code. Found by cocci: drivers/media/usb/stk1160/stk1160-video.c:133:12-13: WARNING opportunity for min() drivers/media/usb/stk1160/stk1160-video.c:176:13-14: WARNING opportunity for min() Signed-off-by: Ricardo Ribalda <ribalda@chromium.org> --- drivers/media/usb/stk1160/stk1160-video.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)