All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2 0/2] Fix multiple line dereference
@ 2019-03-05 16:38 Daniela Mormocea
  2019-03-05 16:41 ` [Outreachy kernel] " Julia Lawall
  0 siblings, 1 reply; 2+ messages in thread
From: Daniela Mormocea @ 2019-03-05 16:38 UTC (permalink / raw)
  To: outreachy-kernel; +Cc: Daniela Mormocea

Fix multiple line dereference to avoid checkpatch warnings

Signed-off-by: Daniela Mormocea <daniela.mormocea@gmail.com>
---
Changes in v2:
-turn this patch into a series
 .../vc04_services/bcm2835-camera/bcm2835-camera.c  | 39 ++++++++--------------
 1 file changed, 13 insertions(+), 26 deletions(-)

diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
index 611a6ee..e71738a 100644
--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
@@ -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]);
-- 
2.7.4



^ permalink raw reply related	[flat|nested] 2+ messages in thread
* Re: [Outreachy kernel] [PATCH v2 0/2] Fix multiple line dereference
  2019-03-05 16:38 [PATCH v2 0/2] Fix multiple line dereference Daniela Mormocea
@ 2019-03-05 16:41 ` Julia Lawall
  0 siblings, 0 replies; 2+ messages in thread
From: Julia Lawall @ 2019-03-05 16:41 UTC (permalink / raw)
  To: Daniela Mormocea; +Cc: outreachy-kernel

Actually, the 0 patch should be a cover letter.  It should describe the
contents of the series.  It should not contain changes.  Please reread the
section on sending patch series in the tutorial.

julia

On Tue, 5 Mar 2019, Daniela Mormocea wrote:

> Fix multiple line dereference to avoid checkpatch warnings
>
> Signed-off-by: Daniela Mormocea <daniela.mormocea@gmail.com>
> ---
> Changes in v2:
> -turn this patch into a series
>  .../vc04_services/bcm2835-camera/bcm2835-camera.c  | 39 ++++++++--------------
>  1 file changed, 13 insertions(+), 26 deletions(-)
>
> diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
> index 611a6ee..e71738a 100644
> --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
> +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
> @@ -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]);
> --
> 2.7.4
>
> --
> 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 post to this group, send email to outreachy-kernel@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/1551803887-24894-1-git-send-email-daniela.mormocea%40gmail.com.
> For more options, visit https://groups.google.com/d/optout.
>


^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-03-05 16:41 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-05 16:38 [PATCH v2 0/2] Fix multiple line dereference Daniela Mormocea
2019-03-05 16:41 ` [Outreachy kernel] " Julia Lawall

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.