projects / openwrt / staging / blogic.git / blob
? search:


3e5fc2b4017f4e588bd1061ac4c992a738b5bebc
[openwrt/staging/blogic.git] /
1 From ebbe1b1aad0b52d27beed714cb075e1c83af651f Mon Sep 17 00:00:00 2001
2 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
3 Date: Wed, 21 Feb 2018 15:53:59 +0000
4 Subject: [PATCH 402/454] staging: bcm2835-camera: Fix open parenthesis
5 alignment
6
7 Fix checkpatch "Alignment should match open parenthesis"
8 errors.
9
10 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
11 ---
12 .../bcm2835-camera/bcm2835-camera.c | 12 ++++-----
13 .../vc04_services/bcm2835-camera/controls.c | 25 ++++++++++++-------
14 .../vc04_services/bcm2835-camera/mmal-vchiq.c | 2 +-
15 .../vc04_services/bcm2835-camera/mmal-vchiq.h | 6 ++---
16 4 files changed, 25 insertions(+), 20 deletions(-)
17
18 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
19 +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
20 @@ -419,8 +419,7 @@ static void buffer_cb(struct vchiq_mmal_
21 buf->vb.flags |= V4L2_BUF_FLAG_KEYFRAME;
22
23 v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
24 - "Buffer has ts %llu",
25 - dev->capture.last_timestamp);
26 + "Buffer has ts %llu", dev->capture.last_timestamp);
27 vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
28
29 if (mmal_flags & MMAL_BUFFER_HEADER_FLAG_EOS &&
30 @@ -589,8 +588,8 @@ static int start_streaming(struct vb2_qu
31 vchiq_mmal_port_enable(dev->instance, dev->capture.port, buffer_cb);
32 if (ret) {
33 v4l2_err(&dev->v4l2_dev,
34 - "Failed to enable capture port - error %d. Disabling camera port again\n",
35 - ret);
36 + "Failed to enable capture port - error %d. Disabling camera port again\n",
37 + ret);
38
39 vchiq_mmal_port_disable(dev->instance,
40 dev->capture.camera_port);
41 @@ -998,8 +997,7 @@ static int vidioc_try_fmt_vid_cap(struct
42 f->fmt.pix.bytesperline =
43 (f->fmt.pix.bytesperline + align_mask) & ~align_mask;
44 v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
45 - "Not removing padding, so bytes/line = %d, "
46 - "(align_mask %d)\n",
47 + "Not removing padding, so bytes/line = %d, (align_mask %d)\n",
48 f->fmt.pix.bytesperline, align_mask);
49 }
50
51 @@ -1345,7 +1343,7 @@ static int vidioc_s_fmt_vid_cap(struct f
52 }
53
54 static int vidioc_enum_framesizes(struct file *file, void *fh,
55 - struct v4l2_frmsizeenum *fsize)
56 + struct v4l2_frmsizeenum *fsize)
57 {
58 struct bm2835_mmal_dev *dev = video_drvdata(file);
59 static const struct v4l2_frmsize_stepwise sizes = {
60 --- a/drivers/staging/vc04_services/bcm2835-camera/controls.c
61 +++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c
62 @@ -1257,9 +1257,12 @@ int bm2835_mmal_init_controls(struct bm2
63
64 switch (ctrl->type) {
65 case MMAL_CONTROL_TYPE_STD:
66 - dev->ctrls[c] = v4l2_ctrl_new_std(hdl,
67 - &bm2835_mmal_ctrl_ops, ctrl->id,
68 - ctrl->min, ctrl->max, ctrl->step, ctrl->def);
69 + dev->ctrls[c] =
70 + v4l2_ctrl_new_std(hdl,
71 + &bm2835_mmal_ctrl_ops,
72 + ctrl->id, ctrl->min,
73 + ctrl->max, ctrl->step,
74 + ctrl->def);
75 break;
76
77 case MMAL_CONTROL_TYPE_STD_MENU:
78 @@ -1283,16 +1286,20 @@ int bm2835_mmal_init_controls(struct bm2
79 mask = ~mask;
80 }
81
82 - dev->ctrls[c] = v4l2_ctrl_new_std_menu(hdl,
83 - &bm2835_mmal_ctrl_ops, ctrl->id,
84 - ctrl->max, mask, ctrl->def);
85 + dev->ctrls[c] =
86 + v4l2_ctrl_new_std_menu(hdl,
87 + &bm2835_mmal_ctrl_ops,
88 + ctrl->id, ctrl->max,
89 + mask, ctrl->def);
90 break;
91 }
92
93 case MMAL_CONTROL_TYPE_INT_MENU:
94 - dev->ctrls[c] = v4l2_ctrl_new_int_menu(hdl,
95 - &bm2835_mmal_ctrl_ops, ctrl->id,
96 - ctrl->max, ctrl->def, ctrl->imenu);
97 + dev->ctrls[c] =
98 + v4l2_ctrl_new_int_menu(hdl,
99 + &bm2835_mmal_ctrl_ops,
100 + ctrl->id, ctrl->max,
101 + ctrl->def, ctrl->imenu);
102 break;
103
104 case MMAL_CONTROL_TYPE_CLUSTER:
105 --- a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
106 +++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
107 @@ -717,7 +717,7 @@ static int send_synchronous_mmal_msg(str
108 if (payload_len >
109 (MMAL_MSG_MAX_SIZE - sizeof(struct mmal_msg_header))) {
110 pr_err("payload length %d exceeds max:%d\n", payload_len,
111 - (int)(MMAL_MSG_MAX_SIZE -
112 + (int)(MMAL_MSG_MAX_SIZE -
113 sizeof(struct mmal_msg_header)));
114 return -EINVAL;
115 }
116 --- a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h
117 +++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h
118 @@ -131,7 +131,7 @@ int vchiq_mmal_port_enable(
119 * disable a port will dequeue any pending buffers
120 */
121 int vchiq_mmal_port_disable(struct vchiq_mmal_instance *instance,
122 - struct vchiq_mmal_port *port);
123 + struct vchiq_mmal_port *port);
124
125 int vchiq_mmal_port_parameter_set(struct vchiq_mmal_instance *instance,
126 struct vchiq_mmal_port *port,
127 @@ -149,8 +149,8 @@ int vchiq_mmal_port_set_format(struct vc
128 struct vchiq_mmal_port *port);
129
130 int vchiq_mmal_port_connect_tunnel(struct vchiq_mmal_instance *instance,
131 - struct vchiq_mmal_port *src,
132 - struct vchiq_mmal_port *dst);
133 + struct vchiq_mmal_port *src,
134 + struct vchiq_mmal_port *dst);
135
136 int vchiq_mmal_version(struct vchiq_mmal_instance *instance,
137 u32 *major_out,
John Crispins staging tree