Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6299080 authored by Daeseok Youn's avatar Daeseok Youn Committed by Greg Kroah-Hartman
Browse files

staging: atomisp: simplify if statement in atomisp_get_sensor_fps() 



If v4l2_subdev_call() gets the global frame interval values,
it returned 0 and it could be checked whether numerator is zero or not.

If the numerator is not zero, the fps could be calculated in this function.
If not, it just returns 0.

Signed-off-by: default avatarDaeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3797616e

drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c

+10 −12
Original line number Diff line number Diff line
@@ -153,20 +153,18 @@ struct atomisp_acc_pipe *atomisp_to_acc_pipe(struct video_device *dev) 


static unsigned short atomisp_get_sensor_fps(struct atomisp_sub_device *asd)

{

	struct v4l2_subdev_frame_interval frame_interval;

	struct v4l2_subdev_frame_interval fi;

	struct atomisp_device *isp = asd->isp;

	unsigned short fps;



	if (v4l2_subdev_call(isp->inputs[asd->input_curr].camera,

	    video, g_frame_interval, &frame_interval)) {

		fps = 0;

	} else {

		if (frame_interval.interval.numerator)

			fps = frame_interval.interval.denominator /

			    frame_interval.interval.numerator;

		else

			fps = 0;

	}

	unsigned short fps = 0;

	int ret;



	ret = v4l2_subdev_call(isp->inputs[asd->input_curr].camera,

			       video, g_frame_interval, &fi);



	if (!ret && fi.interval.numerator)

		fps = fi.interval.denominator / fi.interval.numerator;



	return fps;

}