Commit fcdd047e authored by Dave Stevenson's avatar Dave Stevenson Committed by Greg Kroah-Hartman

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>
Signed-off-by: default avatarStefan Wahren <wahrenst@gmx.net>
Acked-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Acked-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fe78fd7b
...@@ -557,8 +557,8 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count) ...@@ -557,8 +557,8 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
vchiq_mmal_port_enable(dev->instance, dev->capture.port, buffer_cb); vchiq_mmal_port_enable(dev->instance, dev->capture.port, buffer_cb);
if (ret) { if (ret) {
v4l2_err(&dev->v4l2_dev, v4l2_err(&dev->v4l2_dev,
"Failed to enable capture port - error %d. Disabling camera port again\n", "Failed to enable capture port - error %d. Disabling camera port again\n",
ret); ret);
vchiq_mmal_port_disable(dev->instance, vchiq_mmal_port_disable(dev->instance,
dev->capture.camera_port); dev->capture.camera_port);
...@@ -952,8 +952,7 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv, ...@@ -952,8 +952,7 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
f->fmt.pix.bytesperline = f->fmt.pix.bytesperline =
(f->fmt.pix.bytesperline + align_mask) & ~align_mask; (f->fmt.pix.bytesperline + align_mask) & ~align_mask;
v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev, v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
"Not removing padding, so bytes/line = %d, " "Not removing padding, so bytes/line = %d, (align_mask %d)\n",
"(align_mask %d)\n",
f->fmt.pix.bytesperline, align_mask); f->fmt.pix.bytesperline, align_mask);
} }
...@@ -1299,7 +1298,7 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv, ...@@ -1299,7 +1298,7 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
} }
static int vidioc_enum_framesizes(struct file *file, void *fh, 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); struct bm2835_mmal_dev *dev = video_drvdata(file);
static const struct v4l2_frmsize_stepwise sizes = { static const struct v4l2_frmsize_stepwise sizes = {
......
...@@ -1260,9 +1260,12 @@ int bm2835_mmal_init_controls(struct bm2835_mmal_dev *dev, ...@@ -1260,9 +1260,12 @@ int bm2835_mmal_init_controls(struct bm2835_mmal_dev *dev,
switch (ctrl->type) { switch (ctrl->type) {
case MMAL_CONTROL_TYPE_STD: case MMAL_CONTROL_TYPE_STD:
dev->ctrls[c] = v4l2_ctrl_new_std(hdl, dev->ctrls[c] =
&bm2835_mmal_ctrl_ops, ctrl->id, v4l2_ctrl_new_std(hdl,
ctrl->min, ctrl->max, ctrl->step, ctrl->def); &bm2835_mmal_ctrl_ops,
ctrl->id, ctrl->min,
ctrl->max, ctrl->step,
ctrl->def);
break; break;
case MMAL_CONTROL_TYPE_STD_MENU: case MMAL_CONTROL_TYPE_STD_MENU:
...@@ -1286,16 +1289,20 @@ int bm2835_mmal_init_controls(struct bm2835_mmal_dev *dev, ...@@ -1286,16 +1289,20 @@ int bm2835_mmal_init_controls(struct bm2835_mmal_dev *dev,
mask = ~mask; mask = ~mask;
} }
dev->ctrls[c] = v4l2_ctrl_new_std_menu(hdl, dev->ctrls[c] =
&bm2835_mmal_ctrl_ops, ctrl->id, v4l2_ctrl_new_std_menu(hdl,
ctrl->max, mask, ctrl->def); &bm2835_mmal_ctrl_ops,
ctrl->id, ctrl->max,
mask, ctrl->def);
break; break;
} }
case MMAL_CONTROL_TYPE_INT_MENU: case MMAL_CONTROL_TYPE_INT_MENU:
dev->ctrls[c] = v4l2_ctrl_new_int_menu(hdl, dev->ctrls[c] =
&bm2835_mmal_ctrl_ops, ctrl->id, v4l2_ctrl_new_int_menu(hdl,
ctrl->max, ctrl->def, ctrl->imenu); &bm2835_mmal_ctrl_ops,
ctrl->id, ctrl->max,
ctrl->def, ctrl->imenu);
break; break;
case MMAL_CONTROL_TYPE_CLUSTER: case MMAL_CONTROL_TYPE_CLUSTER:
......
...@@ -645,7 +645,7 @@ static int send_synchronous_mmal_msg(struct vchiq_mmal_instance *instance, ...@@ -645,7 +645,7 @@ static int send_synchronous_mmal_msg(struct vchiq_mmal_instance *instance,
if (payload_len > if (payload_len >
(MMAL_MSG_MAX_SIZE - sizeof(struct mmal_msg_header))) { (MMAL_MSG_MAX_SIZE - sizeof(struct mmal_msg_header))) {
pr_err("payload length %d exceeds max:%d\n", payload_len, 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))); sizeof(struct mmal_msg_header)));
return -EINVAL; return -EINVAL;
} }
......
...@@ -128,7 +128,7 @@ int vchiq_mmal_port_enable( ...@@ -128,7 +128,7 @@ int vchiq_mmal_port_enable(
* disable a port will dequeue any pending buffers * disable a port will dequeue any pending buffers
*/ */
int vchiq_mmal_port_disable(struct vchiq_mmal_instance *instance, 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, int vchiq_mmal_port_parameter_set(struct vchiq_mmal_instance *instance,
struct vchiq_mmal_port *port, struct vchiq_mmal_port *port,
...@@ -146,8 +146,8 @@ int vchiq_mmal_port_set_format(struct vchiq_mmal_instance *instance, ...@@ -146,8 +146,8 @@ int vchiq_mmal_port_set_format(struct vchiq_mmal_instance *instance,
struct vchiq_mmal_port *port); struct vchiq_mmal_port *port);
int vchiq_mmal_port_connect_tunnel(struct vchiq_mmal_instance *instance, int vchiq_mmal_port_connect_tunnel(struct vchiq_mmal_instance *instance,
struct vchiq_mmal_port *src, struct vchiq_mmal_port *src,
struct vchiq_mmal_port *dst); struct vchiq_mmal_port *dst);
int vchiq_mmal_version(struct vchiq_mmal_instance *instance, int vchiq_mmal_version(struct vchiq_mmal_instance *instance,
u32 *major_out, u32 *major_out,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment