staging: vc04_services: Fix trivial style issues

PATCH Superseded Genki Sky 3 participants 8 messages Dec 4, 2017 – Dec 5, 2017

Subsystems (3)

Staging Broadcom BCM2711/BCM2835 Arm architecture Broadcom BCM281XX/BCM11XXX/BCM216XX Arm architecture

lore

Share & tools

lore

Greg Kroah-Hartman

maintainer

2017-12-04 07:31 UTC #1 lore raw

PATCH 1/1 staging: vc04_services: Fix trivial style issues

Quoted 5 lines · Genki Sky

In bcm2835-camera, handle the following checkpatch.pl types:
- EMBEDDED_FUNCTION_NAME
- MULTILINE_DEREFERENCE
- SPLIT_STRING

Quoted 7 lines

[ note: this is for Task 10 of http://eudyptula-challenge.org/ ]
Signed-off-by Genki Sky <[email protected]>
---
 .../vc04_services/bcm2835-camera/bcm2835-camera.c  | 23 +++++++++-------------
 .../vc04_services/bcm2835-camera/mmal-vchiq.c      |  7 +++----
 2 files changed, 12 insertions(+), 18 deletions(-)

Hi,

This is the friendly patch-bot of Greg Kroah-Hartman. You have sent him a patch that has triggered this response. He used to manually respond to these common problems, but in order to save his sanity (he kept writing the same thing over and over, yet to different people), I was created. Hopefully you will not take offence and will fix the problem in your patch and resubmit it so that it can be accepted into the Linux kernel tree.

You are receiving this message because of the following common error(s) as indicated below:

- Your patch did many different things all at once, making it difficult to review. All Linux kernel patches need to only do one thing at a time. If you need to do multiple things (such as clean up all coding style issues in a file/driver), do it in a sequence of patches, each one doing only one thing. This will make it easier to review the patches to ensure that they are correct, and to help alleviate any merge issues that larger patches can cause.

If you wish to discuss this problem further, or you have questions about how to resolve this issue, please feel free to respond to this email and Greg will reply once he has dug out from the pending patches received from other developers.

thanks,

greg k-h's patch email bot

Dan Carpenter

2017-12-04 10:52 UTC #2 lore raw

PATCH 1/1 staging: vc04_services: Fix trivial style issues

In reply to Genki Sky

Quoted 6 lines · Genki Sky

In bcm2835-camera, handle the following checkpatch.pl types:
- EMBEDDED_FUNCTION_NAME
- MULTILINE_DEREFERENCE
- SPLIT_STRING
[ note: this is for Task 10 of http://eudyptula-challenge.org/ ]

Leave this part out or put it under the --- cut off. We don't want it in the final git log.

Quoted 2 lines

Signed-off-by Genki Sky <[email protected]>

Split it up and resend. Then it's a nice little cleanup. It's cool that checkpatch.pl started complaining about MULTILINE_DEREFERENCEs.

regards,
dan carpenter

Genki Sky

author

2017-12-05 02:39 UTC #3 lore raw

v2 cover staging: vc04_services: Fix trivial style issues

Hi,

This is v2 of a patch series to fix some checkpatch.pl warnings in drivers/staging/vc04_services/bcm2835-camera/*

Changes from v1 [1]:
- Split single patch into multiple patches
- Remove reference to eudyptula in commit message

[1]: https://lkml.kernel.org/r/<30cc7b48def470f1bec8d8d255044f4f220531ee.1512368114.git.sky@genki.is>

[ aside: this is for task-10 of http://eudyptula-challenge.org/ ]

Genki Sky (3):
staging: vc04_services: Join multiline dereferences
staging: vc04_services: Unsplit user-visible strings
staging: vc04_services: Use __func__

 .../vc04_services/bcm2835-camera/bcm2835-camera.c  | 23 +++++++++-------------
 .../vc04_services/bcm2835-camera/mmal-vchiq.c      |  7 +++----
 2 files changed, 12 insertions(+), 18 deletions(-)

--
2.15.1

Genki Sky

author

2017-12-05 02:39 UTC #4 lore raw

PATCH v2 1/3 staging: vc04_services: Join multiline dereferences

Signed-off-by Genki Sky <[email protected]>

---
 .../vc04_services/bcm2835-camera/bcm2835-camera.c        | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c +6 ~~-10~~

index d8766b166675..4ed3b449f97f 100644
@@ -328,11 +328,9 @@ static void buffer_cb(struct vchiq_mmal_instance *instance,
 				pr_debug("Grab another frame");
 				vchiq_mmal_port_parameter_set(
 					instance,
-					dev->capture.
-					camera_port,
+					dev->capture.camera_port,
 					MMAL_PARAMETER_CAPTURE,
-					&dev->capture.
-					frame_count,
+					&dev->capture.frame_count,
 					sizeof(dev->capture.frame_count));
 			}
 		} else {

@@ -368,11 +366,9 @@ static void buffer_cb(struct vchiq_mmal_instance *instance,
 					 "Grab another frame as buffer has EOS");
 				vchiq_mmal_port_parameter_set(
 					instance,
-					dev->capture.
-					camera_port,
+					dev->capture.camera_port,
 					MMAL_PARAMETER_CAPTURE,
-					&dev->capture.
-					frame_count,
+					&dev->capture.frame_count,
 					sizeof(dev->capture.frame_count));
 			}
 		} else {

@@ -1194,8 +1190,8 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev,
 					port->current_buffer.size =
 					    (f->fmt.pix.sizeimage <
 					     (100 << 10))
-					    ? (100 << 10) : f->fmt.pix.
-					    sizeimage;
+					    ? (100 << 10)
+					    : f->fmt.pix.sizeimage;
 				}
 				v4l2_dbg(1, bcm2835_v4l2_debug,
 					 &dev->v4l2_dev,

Signature · 1 line

2.15.1

Greg Kroah-Hartman

maintainer

2017-12-05 06:17 UTC #5 lore raw

PATCH v2 1/3 staging: vc04_services: Join multiline dereferences

Quoted 4 lines · Genki Sky

Signed-off-by Genki Sky <[email protected]>

---
 .../vc04_services/bcm2835-camera/bcm2835-camera.c        | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

I can't take patches without any changelog text at all, sorry.

greg k-h

Genki Sky

author

2017-12-05 02:39 UTC #6 lore raw

PATCH v2 2/3 staging: vc04_services: Unsplit user-visible strings

In reply to Genki Sky

Signed-off-by Genki Sky <[email protected]>

---
 drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c | 7 +++----
 drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c     | 3 +--
 2 files changed, 4 insertions(+), 6 deletions(-)

drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c +3 -4

index 4ed3b449f97f..e26895dc052e 100644
@@ -347,8 +347,7 @@ static void buffer_cb(struct vchiq_mmal_instance *instance,
 				timestamp = ktime_add_us(dev->capture.kernel_start_ts,
 							 runtime_us);
 				v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
-					 "Convert start time %llu and %llu "
-					 "with offset %llu to %llu\n",
+					 "Convert start time %llu and %llu with offset %llu to %llu\n",
 					 ktime_to_ns(dev->capture.kernel_start_ts),
 					 dev->capture.vc_start_timestamp, pts,
 					 ktime_to_ns(timestamp));

@@ -532,8 +531,8 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
 	    vchiq_mmal_port_enable(dev->instance, dev->capture.port, buffer_cb);
 	if (ret) {
 		v4l2_err(&dev->v4l2_dev,
-			"Failed to enable capture port - error %d. "
-			"Disabling camera port again\n", ret);
+			"Failed to enable capture port - error %d. Disabling camera port again\n",
+			ret);
 
 		vchiq_mmal_port_disable(dev->instance,
 					dev->capture.camera_port);

drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c +1 -2

index 6ea7fb0ea50e..5ddea4f54bf7 100644
@@ -1360,8 +1360,7 @@ static int port_action_handle(struct vchiq_mmal_instance *instance,
 
 	ret = -rmsg->u.port_action_reply.status;
 
-	pr_debug("%s:result:%d component:0x%x port:%d action:%s(%d)" \
-		 " connect component:0x%x connect port:%d\n",
+	pr_debug("%s:result:%d component:0x%x port:%d action:%s(%d) connect component:0x%x connect port:%d\n",
 		 __func__,
 		 ret, port->component->handle, port->handle,
 		 port_action_type_names[action_type],

Signature · 1 line

2.15.1

Genki Sky

author

2017-12-05 02:39 UTC #7 lore raw

PATCH v2 3/3 staging: vc04_services: Use __func__

In reply to Genki Sky

Signed-off-by Genki Sky <[email protected]>

---
 drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c +2 -2

index 5ddea4f54bf7..6c4d8b4c7cd9 100644
@@ -618,8 +618,8 @@ static void buffer_to_host_cb(struct vchiq_mmal_instance *instance,
 	struct mmal_msg_context *msg_context;
 	u32 handle;
 
-	pr_debug("buffer_to_host_cb: instance:%p msg:%p msg_len:%d\n",
-		 instance, msg, msg_len);
+	pr_debug("%s: instance:%p msg:%p msg_len:%d\n",
+		 __func__, instance, msg, msg_len);
 
 	if (msg->u.buffer_from_host.drvbuf.magic == MMAL_MAGIC) {
 		handle = msg->u.buffer_from_host.drvbuf.client_context;

Signature · 1 line

2.15.1