leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: bcm2835-camera: Simplify set_framerate_params

Browse Source 
This simplifies set_framerate_params and avoids the multiple assignment
in one line by moving the fps_high handling out of the if statement.

Reviewed-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Link: https://lore.kernel.org/r/1585485901-10172-5-git-send-email-stefan.wahren@i2se.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Stefan Wahren 2020-03-29 14:44:56 +02:00 committed by Greg Kroah-Hartman
parent a9939ce41b
commit 576b4ff899
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/staging/vc04_services/bcm2835-camera/controls.c
View File

@ -1280,21 +1280,18 @@ int set_framerate_params(struct bm2835_mmal_dev *dev)
struct mmal_parameter_fps_range fps_range;
int ret;
fps_range.fps_high.num = dev->capture.timeperframe.denominator;
fps_range.fps_high.den = dev->capture.timeperframe.numerator;
if ((dev->exposure_mode_active != MMAL_PARAM_EXPOSUREMODE_OFF) &&
(dev->exp_auto_priority)) {
/* Variable FPS. Define min FPS as 1fps.
* Max as max defined FPS.
*/
/* Variable FPS. Define min FPS as 1fps. */
fps_range.fps_low.num = 1;
fps_range.fps_low.den = 1;
fps_range.fps_high.num = dev->capture.timeperframe.denominator;
fps_range.fps_high.den = dev->capture.timeperframe.numerator;
} else {
/* Fixed FPS - set min and max to be the same */
fps_range.fps_low.num = fps_range.fps_high.num =
dev->capture.timeperframe.denominator;
fps_range.fps_low.den = fps_range.fps_high.den =
dev->capture.timeperframe.numerator;
fps_range.fps_low.num = fps_range.fps_high.num;
fps_range.fps_low.den = fps_range.fps_high.den;
}
v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,