Commit a86f2b59 authored by Akinobu Mita's avatar Akinobu Mita Committed by Mauro Carvalho Chehab
Browse files

media: staging: bcm2835-camera: use V4L2_FRACT_COMPARE 



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

Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent cf6a9896

drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c

+2 −6
Original line number Diff line number Diff line
@@ -1370,10 +1370,6 @@ static int vidioc_g_parm(struct file *file, void *priv, 
	return 0;

}



#define FRACT_CMP(a, OP, b)	\

	((u64)(a).numerator * (b).denominator  OP  \

	 (u64)(b).numerator * (a).denominator)



static int vidioc_s_parm(struct file *file, void *priv,

			 struct v4l2_streamparm *parm)

{
@@ -1387,8 +1383,8 @@ static int vidioc_s_parm(struct file *file, void *priv, 


	/* tpf: {*, 0} resets timing; clip to [min, max]*/

	tpf = tpf.denominator ? tpf : tpf_default;

	tpf = FRACT_CMP(tpf, <, tpf_min) ? tpf_min : tpf;

	tpf = FRACT_CMP(tpf, >, tpf_max) ? tpf_max : tpf;

	tpf = V4L2_FRACT_COMPARE(tpf, <, tpf_min) ? tpf_min : tpf;

	tpf = V4L2_FRACT_COMPARE(tpf, >, tpf_max) ? tpf_max : tpf;



	dev->capture.timeperframe = tpf;

	parm->parm.capture.timeperframe = tpf;