media: vivid: use V4L2_FRACT_COMPARE

Now the equivalent of FRACT_CMP() is added in v4l2 common internal API
header.

Cc: Matt Ranostay <matt.ranostay@konsulko.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Akinobu Mita 2018-10-20 10:26:26 -04:00 committed by Mauro Carvalho Chehab
parent 85de5e069a
commit a714f6c70c
1 changed files with 3 additions and 6 deletions
drivers/media/platform/vivid

View File

@ -1835,9 +1835,6 @@ int vivid_vid_cap_g_parm(struct file *file, void *priv,
return 0; return 0;
} }
#define FRACT_CMP(a, OP, b) \
((u64)(a).numerator * (b).denominator OP (u64)(b).numerator * (a).denominator)
int vivid_vid_cap_s_parm(struct file *file, void *priv, int vivid_vid_cap_s_parm(struct file *file, void *priv,
struct v4l2_streamparm *parm) struct v4l2_streamparm *parm)
{ {
@ -1858,14 +1855,14 @@ int vivid_vid_cap_s_parm(struct file *file, void *priv,
if (tpf.denominator == 0) if (tpf.denominator == 0)
tpf = webcam_intervals[ival_sz - 1]; tpf = webcam_intervals[ival_sz - 1];
for (i = 0; i < ival_sz; i++) for (i = 0; i < ival_sz; i++)
if (FRACT_CMP(tpf, >=, webcam_intervals[i])) if (V4L2_FRACT_COMPARE(tpf, >=, webcam_intervals[i]))
break; break;
if (i == ival_sz) if (i == ival_sz)
i = ival_sz - 1; i = ival_sz - 1;
dev->webcam_ival_idx = i; dev->webcam_ival_idx = i;
tpf = webcam_intervals[dev->webcam_ival_idx]; tpf = webcam_intervals[dev->webcam_ival_idx];
tpf = FRACT_CMP(tpf, <, tpf_min) ? tpf_min : tpf; tpf = V4L2_FRACT_COMPARE(tpf, <, tpf_min) ? tpf_min : tpf;
tpf = FRACT_CMP(tpf, >, tpf_max) ? tpf_max : tpf; tpf = V4L2_FRACT_COMPARE(tpf, >, tpf_max) ? tpf_max : tpf;
/* resync the thread's timings */ /* resync the thread's timings */
dev->cap_seq_resync = true; dev->cap_seq_resync = true;