staging: vc04_services: Fix two warnings
Subsystems (3)
v4 cover staging: vc04_services: Fix two warnings
Fix the following warnings by checkpatch:
-Logical continuations should be on the previous line -Avoid multiple line dereference
Daniela Mormocea (2):
Fix multiple line dereference
Fix logical continuations warnings
.../vc04_services/bcm2835-camera/bcm2835-camera.c | 51 ++++++++-------------- 1 file changed, 19 insertions(+), 32 deletions(-)
Signature · 1 line
2.7.4
PATCH v4 1/2 Fix multiple line dereference
Fix multiple line dereference to avoid checkpatch warnings
Signed-off-by Daniela Mormocea <[email protected]>
--- .../vc04_services/bcm2835-camera/bcm2835-camera.c | 39 ++++++++-------------- 1 file changed, 13 insertions(+), 26 deletions(-)
drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c +13 -26
@@ -312,8 +312,7 @@ static void buffer_cleanup(struct vb2_buffer *vb)static inline bool is_capturing (struct bm2835_mmal_dev *dev) {return dev->capture.camera_port == - &dev-> - component[MMAL_COMPONENT_CAMERA ]->output[MMAL_CAMERA_PORT_CAPTURE ]; + &dev->component[MMAL_COMPONENT_CAMERA ]->output[MMAL_CAMERA_PORT_CAPTURE ]; } static void buffer_cb(struct vchiq_mmal_instance *instance,
@@ -751,8 +750,7 @@ static int vidioc_overlay(struct file *file, void *f, unsigned int on)return 0 ;/* already in requested state */ src = - &dev->component[MMAL_COMPONENT_CAMERA ]-> - output[MMAL_CAMERA_PORT_PREVIEW ]; + &dev->component[MMAL_COMPONENT_CAMERA ]->output[MMAL_CAMERA_PORT_PREVIEW ];if (!on) {/* disconnect preview ports and disable component */
@@ -807,8 +805,7 @@ static int vidioc_g_fbuf(struct file *file, void *fh,*/ struct bm2835_mmal_dev *dev =video_drvdata (file);struct vchiq_mmal_port *preview_port = - &dev->component[MMAL_COMPONENT_CAMERA ]-> - output[MMAL_CAMERA_PORT_PREVIEW ]; + &dev->component[MMAL_COMPONENT_CAMERA ]->output[MMAL_CAMERA_PORT_PREVIEW ]; a->capability =V4L2_FBUF_CAP_EXTERNOVERLAY |V4L2_FBUF_CAP_GLOBAL_ALPHA ;
@@ -1000,8 +997,7 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev, dev->capture.camera_port, NULL); dev->capture.camera_port =NULL ; ret =vchiq_mmal_component_disable (dev->instance, - dev->capture. - encode_component); + dev->capture.encode_component);if (ret) v4l2_err(&dev->v4l2_dev, "Failed to disable encode component %d\n",
@@ -1016,26 +1012,22 @@ 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[MMAL_COMPONENT_CAMERA ]-> - output[MMAL_CAMERA_PORT_VIDEO ]; + &dev->component[MMAL_COMPONENT_CAMERA ]->output[MMAL_CAMERA_PORT_VIDEO ];else camera_port = port = - &dev->component[MMAL_COMPONENT_CAMERA ]-> - output[MMAL_CAMERA_PORT_CAPTURE ]; + &dev->component[MMAL_COMPONENT_CAMERA ]->output[MMAL_CAMERA_PORT_CAPTURE ];break ;case MMAL_COMPONENT_IMAGE_ENCODE : encode_component = dev->component[MMAL_COMPONENT_IMAGE_ENCODE ]; port = &dev->component[MMAL_COMPONENT_IMAGE_ENCODE ]->output[0 ]; camera_port = - &dev->component[MMAL_COMPONENT_CAMERA ]-> - output[MMAL_CAMERA_PORT_CAPTURE ]; + &dev->component[MMAL_COMPONENT_CAMERA ]->output[MMAL_CAMERA_PORT_CAPTURE ];break ;case MMAL_COMPONENT_VIDEO_ENCODE : encode_component = dev->component[MMAL_COMPONENT_VIDEO_ENCODE ]; port = &dev->component[MMAL_COMPONENT_VIDEO_ENCODE ]->output[0 ]; camera_port = - &dev->component[MMAL_COMPONENT_CAMERA ]-> - output[MMAL_CAMERA_PORT_VIDEO ]; + &dev->component[MMAL_COMPONENT_CAMERA ]->output[MMAL_CAMERA_PORT_VIDEO ];break ;default :break ;
@@ -1077,13 +1069,11 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev,if (!ret && camera_port == - &dev->component[MMAL_COMPONENT_CAMERA ]-> - output[MMAL_CAMERA_PORT_VIDEO ]) { + &dev->component[MMAL_COMPONENT_CAMERA ]->output[MMAL_CAMERA_PORT_VIDEO ]) {bool overlay_enabled = !!dev->component[MMAL_COMPONENT_PREVIEW ]->enabled;struct vchiq_mmal_port *preview_port = - &dev->component[MMAL_COMPONENT_CAMERA ]-> - output[MMAL_CAMERA_PORT_PREVIEW ]; + &dev->component[MMAL_COMPONENT_CAMERA ]->output[MMAL_CAMERA_PORT_PREVIEW ];/* Preview and encode ports need to match on resolution */ if (overlay_enabled) {/* Need to disable the overlay before we can update
@@ -1677,8 +1667,7 @@ static int mmal_init(struct bm2835_mmal_dev *dev)/* get the video encoder component ready */ ret =vchiq_mmal_component_init (dev->instance,"ril.video_encode" , - &dev-> - component[MMAL_COMPONENT_VIDEO_ENCODE ]); + &dev->component[MMAL_COMPONENT_VIDEO_ENCODE ]);if (ret <0 ) goto unreg_image_encoder;
@@ -1801,12 +1790,10 @@ static void bcm2835_cleanup_instance(struct bm2835_mmal_dev *dev) dev->component[MMAL_COMPONENT_CAMERA]);vchiq_mmal_component_finalise (dev->instance, - dev-> - component[MMAL_COMPONENT_VIDEO_ENCODE ]); + dev->component[MMAL_COMPONENT_VIDEO_ENCODE ]);vchiq_mmal_component_finalise (dev->instance, - dev-> - component[MMAL_COMPONENT_IMAGE_ENCODE ]); + dev->component[MMAL_COMPONENT_IMAGE_ENCODE ]);vchiq_mmal_component_finalise (dev->instance, dev->component[MMAL_COMPONENT_PREVIEW ]);
Signature · 1 line
2.7.4
PATCH v4 2/2 Fix logical continuations warnings
In reply to Daniela MormoceaCorrectly break up lines with boolean operators
so to avoid checkpatch warning
Signed-off-by Daniela Mormocea <[email protected]>
--- .../staging/vc04_services/bcm2835-camera/bcm2835-camera.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c +6 -6
@@ -512,8 +512,8 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)msleep (300 );/* enable the connection from camera to encoder (if applicable) */ -if (dev->capture.camera_port != dev->capture.port - && dev->capture.camera_port) { +if (dev->capture.camera_port != dev->capture.port && + dev->capture.camera_port) { ret =vchiq_mmal_port_enable (dev->instance, dev->capture.camera_port,NULL );if (ret) {
@@ -1009,8 +1009,8 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev,switch (mfmt->mmal_component) {case MMAL_COMPONENT_CAMERA :/* Make a further decision on port based on resolution */ -if (f->fmt.pix.width <= max_video_width - && f->fmt.pix.height <= max_video_height) +if (f->fmt.pix.width <= max_video_width && + f->fmt.pix.height <= max_video_height) camera_port = port = &dev->component[MMAL_COMPONENT_CAMERA ]->output[MMAL_CAMERA_PORT_VIDEO ];else
@@ -1067,8 +1067,8 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev, ret =vchiq_mmal_port_set_format (dev->instance, camera_port); -if (!ret - && camera_port == +if (!ret && + camera_port == &dev->component[MMAL_COMPONENT_CAMERA ]->output[MMAL_CAMERA_PORT_VIDEO ]) {bool overlay_enabled = !!dev->component[MMAL_COMPONENT_PREVIEW ]->enabled;
Signature · 1 line
2.7.4