1 From 1ff6cbebfb5ce6a9509eb29d5f98d6b8710c021d Mon Sep 17 00:00:00 2001
2 From: Genki Sky <sky@genki.is>
3 Date: Tue, 5 Dec 2017 19:09:54 -0500
4 Subject: [PATCH 387/454] staging: vc04_services: Join multiline dereferences
6 commit 7260ea5fc327344974716e5109180f96f0483a85 upstream
8 This was found using checkpatch.pl's MULTILINE_DEREFERENCE warning.
9 Putting the dereference onto one line makes them easier to read,
10 especially when part of a larger expression (in this case, function
11 arguments and ternary operator), and when the dereferences are short
14 Signed-off-by: Genki Sky <sky@genki.is>
15 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
17 .../bcm2835-camera/bcm2835-camera.c | 16 ++++++----------
18 1 file changed, 6 insertions(+), 10 deletions(-)
20 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
21 +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
22 @@ -356,11 +356,9 @@ static void buffer_cb(struct vchiq_mmal_
23 pr_debug("Grab another frame");
24 vchiq_mmal_port_parameter_set(
28 + dev->capture.camera_port,
29 MMAL_PARAMETER_CAPTURE,
32 + &dev->capture.frame_count,
33 sizeof(dev->capture.frame_count));
36 @@ -419,11 +417,9 @@ static void buffer_cb(struct vchiq_mmal_
37 "Grab another frame as buffer has EOS");
38 vchiq_mmal_port_parameter_set(
42 + dev->capture.camera_port,
43 MMAL_PARAMETER_CAPTURE,
46 + &dev->capture.frame_count,
47 sizeof(dev->capture.frame_count));
50 @@ -1268,8 +1264,8 @@ static int mmal_setup_components(struct
51 port->current_buffer.size =
52 (f->fmt.pix.sizeimage <
54 - ? (100 << 10) : f->fmt.pix.
57 + : f->fmt.pix.sizeimage;
59 v4l2_dbg(1, bcm2835_v4l2_debug,