Commit 433cef0d authored by Dave Stevenson's avatar Dave Stevenson Committed by Phil Elwell
Browse files

staging: bcm2835-camera: Fix open parenthesis alignment 



Fix checkpatch "Alignment should match open parenthesis"
errors.

Signed-off-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.org>
parent a5ce1ad4

drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c

+5 −7
Original line number Diff line number Diff line
@@ -419,8 +419,7 @@ static void buffer_cb(struct vchiq_mmal_instance *instance, 
		buf->vb.flags |= V4L2_BUF_FLAG_KEYFRAME;



	v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,

		 "Buffer has ts %llu",

		 dev->capture.last_timestamp);

		 "Buffer has ts %llu", dev->capture.last_timestamp);

	vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);



	if (mmal_flags & MMAL_BUFFER_HEADER_FLAG_EOS &&
@@ -997,8 +996,7 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv, 
		f->fmt.pix.bytesperline =

			(f->fmt.pix.bytesperline + align_mask) & ~align_mask;

		v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,

			 "Not removing padding, so bytes/line = %d, "

			 "(align_mask %d)\n",

			 "Not removing padding, so bytes/line = %d, (align_mask %d)\n",

			 f->fmt.pix.bytesperline, align_mask);

	}

drivers/staging/vc04_services/bcm2835-camera/controls.c

+16 −9
Original line number Diff line number Diff line
@@ -1257,9 +1257,12 @@ int bm2835_mmal_init_controls(struct bm2835_mmal_dev *dev, 


		switch (ctrl->type) {

		case MMAL_CONTROL_TYPE_STD:

			dev->ctrls[c] = v4l2_ctrl_new_std(hdl,

				&bm2835_mmal_ctrl_ops, ctrl->id,

				ctrl->min, ctrl->max, ctrl->step, ctrl->def);

			dev->ctrls[c] =

				v4l2_ctrl_new_std(hdl,

						  &bm2835_mmal_ctrl_ops,

						  ctrl->id, ctrl->min,

						  ctrl->max, ctrl->step,

						  ctrl->def);

			break;



		case MMAL_CONTROL_TYPE_STD_MENU:
@@ -1283,16 +1286,20 @@ int bm2835_mmal_init_controls(struct bm2835_mmal_dev *dev, 
				mask = ~mask;

			}



			dev->ctrls[c] = v4l2_ctrl_new_std_menu(hdl,

			&bm2835_mmal_ctrl_ops, ctrl->id,

			ctrl->max, mask, ctrl->def);

			dev->ctrls[c] =

				v4l2_ctrl_new_std_menu(hdl,

						       &bm2835_mmal_ctrl_ops,

						       ctrl->id, ctrl->max,

						       mask, ctrl->def);

			break;

		}



		case MMAL_CONTROL_TYPE_INT_MENU:

			dev->ctrls[c] = v4l2_ctrl_new_int_menu(hdl,

				&bm2835_mmal_ctrl_ops, ctrl->id,

				ctrl->max, ctrl->def, ctrl->imenu);

			dev->ctrls[c] =

				v4l2_ctrl_new_int_menu(hdl,

						       &bm2835_mmal_ctrl_ops,

						       ctrl->id, ctrl->max,

						       ctrl->def, ctrl->imenu);

			break;



		case MMAL_CONTROL_TYPE_CLUSTER:

drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c

+1 −1

File changed.

Contains only whitespace changes.

drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h

+3 −3

File changed.

Contains only whitespace changes.