+++ /dev/null
-From 4ed895c5c9f55f565d5ecc19e799e109673db44f Mon Sep 17 00:00:00 2001
-From: Dave Stevenson <dave.stevenson@raspberrypi.org>
-Date: Wed, 21 Feb 2018 15:53:59 +0000
-Subject: [PATCH] staging: bcm2835-camera: Fix open parenthesis
- alignment
-
-Fix checkpatch "Alignment should match open parenthesis"
-errors.
-
-Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
----
- .../bcm2835-camera/bcm2835-camera.c | 12 ++++-----
- .../vc04_services/bcm2835-camera/controls.c | 25 ++++++++++++-------
- .../vc04_services/bcm2835-camera/mmal-vchiq.c | 2 +-
- .../vc04_services/bcm2835-camera/mmal-vchiq.h | 6 ++---
- 4 files changed, 25 insertions(+), 20 deletions(-)
-
---- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
-+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
-@@ -415,8 +415,7 @@ static void buffer_cb(struct vchiq_mmal_
- 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 &&
-@@ -584,8 +583,8 @@ static int start_streaming(struct vb2_qu
- vchiq_mmal_port_enable(dev->instance, dev->capture.port, buffer_cb);
- if (ret) {
- v4l2_err(&dev->v4l2_dev,
-- "Failed to enable capture port - error %d. Disabling camera port again\n",
-- ret);
-+ "Failed to enable capture port - error %d. Disabling camera port again\n",
-+ ret);
-
- vchiq_mmal_port_disable(dev->instance,
- dev->capture.camera_port);
-@@ -991,8 +990,7 @@ static int vidioc_try_fmt_vid_cap(struct
- 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);
- }
-
-@@ -1338,7 +1336,7 @@ static int vidioc_s_fmt_vid_cap(struct f
- }
-
- static int vidioc_enum_framesizes(struct file *file, void *fh,
-- struct v4l2_frmsizeenum *fsize)
-+ struct v4l2_frmsizeenum *fsize)
- {
- struct bm2835_mmal_dev *dev = video_drvdata(file);
- static const struct v4l2_frmsize_stepwise sizes = {
---- a/drivers/staging/vc04_services/bcm2835-camera/controls.c
-+++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c
-@@ -1254,9 +1254,12 @@ int bm2835_mmal_init_controls(struct bm2
-
- 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:
-@@ -1280,16 +1283,20 @@ int bm2835_mmal_init_controls(struct bm2
- 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:
---- a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
-+++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
-@@ -651,7 +651,7 @@ static int send_synchronous_mmal_msg(str
- if (payload_len >
- (MMAL_MSG_MAX_SIZE - sizeof(struct mmal_msg_header))) {
- pr_err("payload length %d exceeds max:%d\n", payload_len,
-- (int)(MMAL_MSG_MAX_SIZE -
-+ (int)(MMAL_MSG_MAX_SIZE -
- sizeof(struct mmal_msg_header)));
- return -EINVAL;
- }
---- a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h
-+++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h
-@@ -131,7 +131,7 @@ int vchiq_mmal_port_enable(
- * disable a port will dequeue any pending buffers
- */
- int vchiq_mmal_port_disable(struct vchiq_mmal_instance *instance,
-- struct vchiq_mmal_port *port);
-+ struct vchiq_mmal_port *port);
-
- int vchiq_mmal_port_parameter_set(struct vchiq_mmal_instance *instance,
- struct vchiq_mmal_port *port,
-@@ -149,8 +149,8 @@ int vchiq_mmal_port_set_format(struct vc
- struct vchiq_mmal_port *port);
-
- int vchiq_mmal_port_connect_tunnel(struct vchiq_mmal_instance *instance,
-- struct vchiq_mmal_port *src,
-- struct vchiq_mmal_port *dst);
-+ struct vchiq_mmal_port *src,
-+ struct vchiq_mmal_port *dst);
-
- int vchiq_mmal_version(struct vchiq_mmal_instance *instance,
- u32 *major_out,
projects / openwrt / staging / wigyori.git / blobdiff