Commit b6bd1034 authored by Genki Sky's avatar Genki Sky Committed by Phil Elwell
Browse files

staging: vc04_services: Join multiline dereferences 



commit 7260ea5f upstream

This was found using checkpatch.pl's MULTILINE_DEREFERENCE warning.
Putting the dereference onto one line makes them easier to read,
especially when part of a larger expression (in this case, function
arguments and ternary operator), and when the dereferences are short
(as they are here).

Signed-off-by: default avatarGenki Sky <sky@genki.is>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent da38e1d6

drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c

+6 −10
Original line number Diff line number Diff line
@@ -356,11 +356,9 @@ static void buffer_cb(struct vchiq_mmal_instance *instance, 
				pr_debug("Grab another frame");

				vchiq_mmal_port_parameter_set(

					instance,

					dev->capture.

					camera_port,

					dev->capture.camera_port,

					MMAL_PARAMETER_CAPTURE,

					&dev->capture.

					frame_count,

					&dev->capture.frame_count,

					sizeof(dev->capture.frame_count));

			}

		} else {
@@ -419,11 +417,9 @@ static void buffer_cb(struct vchiq_mmal_instance *instance, 
					 "Grab another frame as buffer has EOS");

				vchiq_mmal_port_parameter_set(

					instance,

					dev->capture.

					camera_port,

					dev->capture.camera_port,

					MMAL_PARAMETER_CAPTURE,

					&dev->capture.

					frame_count,

					&dev->capture.frame_count,

					sizeof(dev->capture.frame_count));

			}

		} else {
@@ -1267,8 +1263,8 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev, 
					port->current_buffer.size =

					    (f->fmt.pix.sizeimage <

					     (100 << 10))

					    ? (100 << 10) : f->fmt.pix.

					    sizeimage;

					    ? (100 << 10)

					    : f->fmt.pix.sizeimage;

				}

				v4l2_dbg(1, bcm2835_v4l2_debug,

					 &dev->v4l2_dev,