Commit 7260ea5f authored by Genki Sky's avatar Genki Sky Committed by Greg Kroah-Hartman

staging: vc04_services: Join multiline dereferences

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 82aec3ed
...@@ -328,11 +328,9 @@ static void buffer_cb(struct vchiq_mmal_instance *instance, ...@@ -328,11 +328,9 @@ static void buffer_cb(struct vchiq_mmal_instance *instance,
pr_debug("Grab another frame"); pr_debug("Grab another frame");
vchiq_mmal_port_parameter_set( vchiq_mmal_port_parameter_set(
instance, instance,
dev->capture. dev->capture.camera_port,
camera_port,
MMAL_PARAMETER_CAPTURE, MMAL_PARAMETER_CAPTURE,
&dev->capture. &dev->capture.frame_count,
frame_count,
sizeof(dev->capture.frame_count)); sizeof(dev->capture.frame_count));
} }
} else { } else {
...@@ -368,11 +366,9 @@ static void buffer_cb(struct vchiq_mmal_instance *instance, ...@@ -368,11 +366,9 @@ static void buffer_cb(struct vchiq_mmal_instance *instance,
"Grab another frame as buffer has EOS"); "Grab another frame as buffer has EOS");
vchiq_mmal_port_parameter_set( vchiq_mmal_port_parameter_set(
instance, instance,
dev->capture. dev->capture.camera_port,
camera_port,
MMAL_PARAMETER_CAPTURE, MMAL_PARAMETER_CAPTURE,
&dev->capture. &dev->capture.frame_count,
frame_count,
sizeof(dev->capture.frame_count)); sizeof(dev->capture.frame_count));
} }
} else { } else {
...@@ -1194,8 +1190,8 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev, ...@@ -1194,8 +1190,8 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev,
port->current_buffer.size = port->current_buffer.size =
(f->fmt.pix.sizeimage < (f->fmt.pix.sizeimage <
(100 << 10)) (100 << 10))
? (100 << 10) : f->fmt.pix. ? (100 << 10)
sizeimage; : f->fmt.pix.sizeimage;
} }
v4l2_dbg(1, bcm2835_v4l2_debug, v4l2_dbg(1, bcm2835_v4l2_debug,
&dev->v4l2_dev, &dev->v4l2_dev,
......
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