From 6ad3bd1cb169213a3dfab84e2221ff40bb7a08f8 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Thu, 10 May 2018 12:42:19 -0700 Subject: [PATCH 378/454] staging: bcm2835: Remove dead code related to framerate. commit aa4f227112dc8d6caf73f494deb4bbd5ecc6eec4 upstream. Fixes a compiler warning about a set-but-not-used variable. I think this was just leftover dead code from before set_framerate_params(), since that also sets up some mmal_parameter_rational structs for fps. Signed-off-by: Eric Anholt Signed-off-by: Greg Kroah-Hartman --- .../staging/vc04_services/bcm2835-camera/bcm2835-camera.c | 5 ----- 1 file changed, 5 deletions(-) --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c @@ -1430,7 +1430,6 @@ static int vidioc_s_parm(struct file *fi { struct bm2835_mmal_dev *dev = video_drvdata(file); struct v4l2_fract tpf; - struct mmal_parameter_rational fps_param; if (parm->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) return -EINVAL; @@ -1447,10 +1446,6 @@ static int vidioc_s_parm(struct file *fi parm->parm.capture.readbuffers = 1; parm->parm.capture.capability = V4L2_CAP_TIMEPERFRAME; - fps_param.num = 0; /* Select variable fps, and then use - * FPS_RANGE to select the actual limits. - */ - fps_param.den = 1; set_framerate_params(dev); return 0;