git.librecmc.org Git - oweals/openwrt.git/blob

   1 From 6ad3bd1cb169213a3dfab84e2221ff40bb7a08f8 Mon Sep 17 00:00:00 2001
   2 From: Eric Anholt <eric@anholt.net>
   3 Date: Thu, 10 May 2018 12:42:19 -0700
   4 Subject: [PATCH 378/454] staging: bcm2835: Remove dead code related to
   5  framerate.
   6
   7 commit aa4f227112dc8d6caf73f494deb4bbd5ecc6eec4 upstream.
   8
   9 Fixes a compiler warning about a set-but-not-used variable. I think
  10 this was just leftover dead code from before set_framerate_params(),
  11 since that also sets up some mmal_parameter_rational structs for fps.
  12
  13 Signed-off-by: Eric Anholt <eric@anholt.net>
  14 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  15 ---
  16  .../staging/vc04_services/bcm2835-camera/bcm2835-camera.c    | 5 -----
  17  1 file changed, 5 deletions(-)
  18
  19 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
  20 +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
  21 @@ -1430,7 +1430,6 @@ static int vidioc_s_parm(struct file *fi
  22  {
  23         struct bm2835_mmal_dev *dev = video_drvdata(file);
  24         struct v4l2_fract tpf;
  25 -       struct mmal_parameter_rational fps_param;
  26
  27         if (parm->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
  28                 return -EINVAL;
  29 @@ -1447,10 +1446,6 @@ static int vidioc_s_parm(struct file *fi
  30         parm->parm.capture.readbuffers  = 1;
  31         parm->parm.capture.capability   = V4L2_CAP_TIMEPERFRAME;
  32
  33 -       fps_param.num = 0;      /* Select variable fps, and then use
  34 -                                * FPS_RANGE to select the actual limits.
  35 -                                */
  36 -       fps_param.den = 1;
  37         set_framerate_params(dev);
  38
  39         return 0;