OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: bcm2835-camera: Fix open parenthesis alignment

Browse Source 
Fix checkpatch "Alignment should match open parenthesis"
errors.

Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
Acked-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Acked-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Dave Stevenson 2019-06-29 14:13:28 +02:00 committed by Greg Kroah-Hartman
parent fe78fd7b18
commit fcdd047e8a
4 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
View File

@ -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);
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);
@ -952,8 +952,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);
}
@ -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,
struct v4l2_frmsizeenum *fsize)
struct v4l2_frmsizeenum *fsize)
{
struct bm2835_mmal_dev *dev = video_drvdata(file);
static const struct v4l2_frmsize_stepwise sizes = {

25
drivers/staging/vc04_services/bcm2835-camera/controls.c
View File

@ -1260,9 +1260,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:
@ -1286,16 +1289,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:

2
drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
View File

@ -645,7 +645,7 @@ static int send_synchronous_mmal_msg(struct vchiq_mmal_instance *instance,
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;
}

6
drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h
View File

@ -128,7 +128,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,
@ -146,8 +146,8 @@ int vchiq_mmal_port_set_format(struct vchiq_mmal_instance *instance,
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,