staging: vc04_services: fix warning of Logical continuations should be on the previous line
Subsystems (3)
PATCH 1/1 staging: vc04_services: fix warning of Logical continuations should be on the previous line
Fix warning of logical continuations should be on the previous line. Issue detected by checkpatch tool.
--- .../bcm2835-camera/bcm2835-camera.c | 41 ++++++++----------- 1 file changed, 17 insertions(+), 24 deletions(-)
drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c +17 -24
@@ -337,9 +337,8 @@ static void buffer_cb(struct vchiq_mmal_instance *instance,if (is_capturing (dev)) {v4l2_dbg (1 , bcm2835_v4l2_debug, &dev->v4l2_dev,"Grab another frame" ); -vchiq_mmal_port_parameter_set ( - instance, - dev->capture.camera_port, +vchiq_mmal_port_parameter_set (instance, + dev->capture.camera_port,MMAL_PARAMETER_CAPTURE , &dev->capture.frame_count,sizeof (dev->capture.frame_count));
@@ -392,9 +391,8 @@ static void buffer_cb(struct vchiq_mmal_instance *instance, is_capturing(dev)) {v4l2_dbg (1 , bcm2835_v4l2_debug, &dev->v4l2_dev,"Grab another frame as buffer has EOS" ); -vchiq_mmal_port_parameter_set ( - instance, - dev->capture.camera_port, +vchiq_mmal_port_parameter_set (instance, + dev->capture.camera_port,MMAL_PARAMETER_CAPTURE , &dev->capture.frame_count,sizeof (dev->capture.frame_count));
@@ -1090,8 +1088,7 @@ 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[COMP_CAMERA ]->output[CAM_PORT_VIDEO ]) {bool overlay_enabled = !!dev->component[COMP_PREVIEW ]->enabled;
@@ -1124,9 +1121,8 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev, dev->capture.timeperframe.numerator; ret =vchiq_mmal_port_set_format (dev->instance, preview_port);if (overlay_enabled) { - ret =vchiq_mmal_port_connect_tunnel ( - dev->instance, - preview_port, + ret =vchiq_mmal_port_connect_tunnel (dev->instance, + preview_port, &dev->component[COMP_PREVIEW ]->input[0 ]);if (!ret) ret = vchiq_mmal_port_enable(dev->instance,
@@ -1154,9 +1150,8 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev, camera_port->recommended_buffer.num; ret = -vchiq_mmal_port_connect_tunnel ( - dev->instance, - camera_port, +vchiq_mmal_port_connect_tunnel (dev->instance, + camera_port, &encode_component->input[0 ]);if (ret) { v4l2_dbg(1, bcm2835_v4l2_debug,
@@ -1655,8 +1650,8 @@ static int mmal_init(struct bm2835_mmal_dev *dev) dev->capture.enc_level =V4L2_MPEG_VIDEO_H264_LEVEL_4_0 ;/* get the preview component ready */ - ret =vchiq_mmal_component_init ( - dev->instance,"ril.video_render" , + ret =vchiq_mmal_component_init (dev->instance, +"ril.video_render" , &dev->component[COMP_PREVIEW ]);if (ret <0 ) goto unreg_camera;
@@ -1669,8 +1664,8 @@ static int mmal_init(struct bm2835_mmal_dev *dev) }/* get the image encoder component ready */ - ret =vchiq_mmal_component_init ( - dev->instance,"ril.image_encode" , + ret =vchiq_mmal_component_init (dev->instance, +"ril.image_encode" , &dev->component[COMP_IMAGE_ENCODE ]);if (ret <0 ) goto unreg_preview;
@@ -1731,15 +1726,13 @@ static int mmal_init(struct bm2835_mmal_dev *dev) unreg_vid_encoder:pr_err ("Cleanup: Destroy video encoder\n" ); -vchiq_mmal_component_finalise ( - dev->instance, - dev->component[COMP_VIDEO_ENCODE ]); +vchiq_mmal_component_finalise (dev->instance, + dev->component[COMP_VIDEO_ENCODE ]); unreg_image_encoder:pr_err ("Cleanup: Destroy image encoder\n" ); -vchiq_mmal_component_finalise ( - dev->instance, - dev->component[COMP_IMAGE_ENCODE ]); +vchiq_mmal_component_finalise (dev->instance, + dev->component[COMP_IMAGE_ENCODE ]); unreg_preview:pr_err ("Cleanup: Destroy video render\n" );
Signature · 1 line
2.21.0
Quoted 2 lines · Jules Irenge
Fix warning of logical continuations should be on the previous line. Issue detected by checkpatch tool.
There seem to be several changes mixed together in this patch.
Don't have a subject line that is identical to a line in the log message. The subject line should be short.
Keeping the arguments of && on the same line, but breaking the line after a == doesn't seem to be a good idea. It would be better to have the left argument of == on one line and the right argument on another, if that is needed.
julia
Quoted 118 lines
Signed-off-by Jules Irenge <[email protected]>--- .../bcm2835-camera/bcm2835-camera.c | 41 ++++++++----------- 1 file changed, 17 insertions(+), 24 deletions(-)drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c +17
-25@@ -337,9 +337,8 @@ static void buffer_cb(struct vchiq_mmal_instance *instance,if (is_capturing (dev)) {v4l2_dbg (1 , bcm2835_v4l2_debug, &dev->v4l2_dev,"Grab another frame" ); -vchiq_mmal_port_parameter_set ( - instance, - dev->capture.camera_port, +vchiq_mmal_port_parameter_set (instance, + dev->capture.camera_port,MMAL_PARAMETER_CAPTURE , &dev->capture.frame_count,sizeof (dev->capture.frame_count));@@ -392,9 +391,8 @@ static void buffer_cb(struct vchiq_mmal_instance *instance, is_capturing(dev)) {v4l2_dbg (1 , bcm2835_v4l2_debug, &dev->v4l2_dev,"Grab another frame as buffer has EOS" ); -vchiq_mmal_port_parameter_set ( - instance, - dev->capture.camera_port, +vchiq_mmal_port_parameter_set (instance, + dev->capture.camera_port,MMAL_PARAMETER_CAPTURE , &dev->capture.frame_count,sizeof (dev->capture.frame_count));@@ -1090,8 +1088,7 @@ 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[COMP_CAMERA ]->output[CAM_PORT_VIDEO ]) {bool overlay_enabled = !!dev->component[COMP_PREVIEW ]->enabled;@@ -1124,9 +1121,8 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev, dev->capture.timeperframe.numerator; ret =vchiq_mmal_port_set_format (dev->instance, preview_port);if (overlay_enabled) { - ret =vchiq_mmal_port_connect_tunnel ( - dev->instance, - preview_port, + ret =vchiq_mmal_port_connect_tunnel (dev->instance, + preview_port, &dev->component[COMP_PREVIEW ]->input[0 ]);if (!ret) ret = vchiq_mmal_port_enable(dev->instance,@@ -1154,9 +1150,8 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev, camera_port->recommended_buffer.num; ret = -vchiq_mmal_port_connect_tunnel ( - dev->instance, - camera_port, +vchiq_mmal_port_connect_tunnel (dev->instance, + camera_port, &encode_component->input[0 ]);if (ret) { v4l2_dbg(1, bcm2835_v4l2_debug,@@ -1655,8 +1650,8 @@ static int mmal_init(struct bm2835_mmal_dev *dev) dev->capture.enc_level =V4L2_MPEG_VIDEO_H264_LEVEL_4_0 ;/* get the preview component ready */ - ret =vchiq_mmal_component_init ( - dev->instance,"ril.video_render" , + ret =vchiq_mmal_component_init (dev->instance, +"ril.video_render" , &dev->component[COMP_PREVIEW ]);if (ret <0 ) goto unreg_camera;@@ -1669,8 +1664,8 @@ static int mmal_init(struct bm2835_mmal_dev *dev) }/* get the image encoder component ready */ - ret =vchiq_mmal_component_init ( - dev->instance,"ril.image_encode" , + ret =vchiq_mmal_component_init (dev->instance, +"ril.image_encode" , &dev->component[COMP_IMAGE_ENCODE ]);if (ret <0 ) goto unreg_preview;@@ -1731,15 +1726,13 @@ static int mmal_init(struct bm2835_mmal_dev *dev) unreg_vid_encoder:pr_err ("Cleanup: Destroy video encoder\n" ); -vchiq_mmal_component_finalise ( - dev->instance, - dev->component[COMP_VIDEO_ENCODE ]); +vchiq_mmal_component_finalise (dev->instance, + dev->component[COMP_VIDEO_ENCODE ]); unreg_image_encoder:pr_err ("Cleanup: Destroy image encoder\n" ); -vchiq_mmal_component_finalise ( - dev->instance, - dev->component[COMP_IMAGE_ENCODE ]); +vchiq_mmal_component_finalise (dev->instance, + dev->component[COMP_IMAGE_ENCODE ]); unreg_preview:pr_err ("Cleanup: Destroy video render\n" ); --2.21.0
--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20191011212745.20262-1-jbi.octave%40gmail.com.
Quoted 12 lines · Julia Lawall
Quoted 2 lines · Jules Irenge
Fix warning of logical continuations should be on the previous line. Issue detected by checkpatch tool.
There seem to be several changes mixed together in this patch.
Don't have a subject line that is identical to a line in the log message. The subject line should be short.
Quoted 7 lines
Keeping the arguments of && on the same line, but breaking the line after a == doesn't seem to be a good idea. It would be better to have the left argument of == on one line and the right argument on another, if that is needed.
julia
Apology,
Yesterday was my bday, I was reckless.
I am resending now. Please do not hesitate to give me a feedback if possible. Thanks
Jules