staging: bcm2835-camera: Fix multiple line dereference errors

Fix checkpatch errors "Avoid multiple line dereference"

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>

diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
index 1f3ada33cbe67c88d6245eb610f54a1594e88a2d..842201903f3beeb66d31b227922ede789b70039d 100644 (file)
--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
@@ -1019,12 +1019,10 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev,
                if (f->fmt.pix.width <= max_video_width &&
                    f->fmt.pix.height <= max_video_height)
                        camera_port = port =
-                           &dev->component[COMP_CAMERA]->
-                           output[CAM_PORT_VIDEO];
+                           &dev->component[COMP_CAMERA]->output[CAM_PORT_VIDEO];
                else
                        camera_port = port =
-                           &dev->component[COMP_CAMERA]->
-                           output[CAM_PORT_CAPTURE];
+                           &dev->component[COMP_CAMERA]->output[CAM_PORT_CAPTURE];
                break;
        case COMP_IMAGE_ENCODE:
                encode_component = dev->component[COMP_IMAGE_ENCODE];
@@ -1215,9 +1213,8 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev,
                                                 port->current_buffer.size);
                                        port->current_buffer.size =
                                            (f->fmt.pix.sizeimage <
-                                            (100 << 10))
-                                           ? (100 << 10)
-                                           : f->fmt.pix.sizeimage;
+                                            (100 << 10)) ?
+                                           (100 << 10) : f->fmt.pix.sizeimage;
                                }
                                v4l2_dbg(1, bcm2835_v4l2_debug,
                                         &dev->v4l2_dev,