You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
54 lines
2.3 KiB
Diff
54 lines
2.3 KiB
Diff
From 59f1fbe55d6e5b878fd422cd969fbee7d5d9b78c Mon Sep 17 00:00:00 2001
|
|
From: Genki Sky <sky@genki.is>
|
|
Date: Tue, 5 Dec 2017 19:09:54 -0500
|
|
Subject: [PATCH 390/454] staging: vc04_services: Unsplit user-visible strings
|
|
|
|
Commit 5ced5a899b405e09cc681b8a1a449815b66744c7 upstream.
|
|
|
|
This was found using checkpatch.pl's SPLIT_STRING warning. While joining
|
|
these strings makes for long lines, the kernel codebase consistently
|
|
does it this way to make user-visible strings easier to grep for.
|
|
|
|
Signed-off-by: Genki Sky <sky@genki.is>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
.../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(-)
|
|
|
|
--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
|
|
+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
|
|
@@ -380,8 +380,7 @@ static void buffer_cb(struct vchiq_mmal_
|
|
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));
|
|
@@ -585,8 +584,8 @@ static int start_streaming(struct vb2_qu
|
|
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);
|
|
--- a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
|
|
+++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
|
|
@@ -1229,8 +1229,7 @@ static int port_action_handle(struct vch
|
|
|
|
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],
|