staging: bcm2835-camera: Simplify set_framerate_params

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>

diff --git a/drivers/staging/vc04_services/bcm2835-camera/controls.c b/drivers/staging/vc04_services/bcm2835-camera/controls.c
index 275ff21..e46f150 100644 (file)
--- a/drivers/staging/vc04_services/bcm2835-camera/controls.c
+++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c
@@ -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,