| Message ID | 20191011211637.19311-1-jbi.octave@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | staging: vc04_services: fix warnings of lines should not end with open parenthesis | expand |
On Fri, 11 Oct 2019, Jules Irenge wrote: > Fix warning of lines should not end with open parenthesis. > Issue detected by checkpatch tool. > > Signed-off-by: Jules Irenge <jbi.octave@gmail.com> > --- > .../bcm2835-camera/bcm2835-camera.c | 38 ++++++++----------- > 1 file changed, 16 insertions(+), 22 deletions(-) > > diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c > index d4d1e44b16b2..c7bb6e3f529c 100644 > --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c > +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c > @@ -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)); You can't reduce the indentation on the function call. It has to stay clearly in the if branch. If you adjust the indentation of some of the arguments, you have to do so to all of the arguments. Similar issues arise below. There may be no way to make some of the calls look nice without a more severe reorganization of the code. julia > @@ -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)); > @@ -1124,9 +1122,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 +1151,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 +1651,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 +1665,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 +1727,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 outreachy-kernel+unsubscribe@googlegroups.com. > To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20191011211637.19311-1-jbi.octave%40gmail.com. >
On Fri, 2019-10-11 at 23:23 +0200, Julia Lawall wrote: > On Fri, 11 Oct 2019, Jules Irenge wrote: > > Fix warning of lines should not end with open parenthesis. > > Issue detected by checkpatch tool. [] > > diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c [] > > @@ -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)); > > You can't reduce the indentation on the function call. It has to stay > clearly in the if branch. > > If you adjust the indentation of some of the arguments, you have to do so > to all of the arguments. > > Similar issues arise below. There may be no way to make some of the calls > look nice without a more severe reorganization of the code. My suggestion would be to shorten the vchiq_mmal_port_parameter_set function name (29 chars is just too long) and pass dev instead of dev->instance as the first argument to this function.
diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c index d4d1e44b16b2..c7bb6e3f529c 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c @@ -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)); @@ -1124,9 +1122,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 +1151,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 +1651,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 +1665,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 +1727,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");
Fix warning of lines should not end with open parenthesis. Issue detected by checkpatch tool. Signed-off-by: Jules Irenge <jbi.octave@gmail.com> --- .../bcm2835-camera/bcm2835-camera.c | 38 ++++++++----------- 1 file changed, 16 insertions(+), 22 deletions(-)