AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-15 02:46:41 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: atomisp: simplify if statement in atomisp_get_sensor_fps()

Browse Source 
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: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Daeseok Youn 2017-03-20 14:42:55 +00:00 committed by Greg Kroah-Hartman
parent 3797616eaa
commit c62990801d
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c
View File

@ -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;
}