From: sky@genki.is (Genki Sky)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 2/3] staging: vc04_services: Unsplit user-visible strings
Date: Mon, 04 Dec 2017 21:39:06 -0500 [thread overview]
Message-ID: <30baaaf1f55a18f8ddc5eacb1f3a8193e553ea5b.1512441073.git.sky@genki.is> (raw)
In-Reply-To: <cover.1512441073.git.sky@genki.is>
Signed-off-by: Genki Sky <sky@genki.is>
---
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(-)
diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
index 4ed3b449f97f..e26895dc052e 100644
--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
@@ -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);
diff --git a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
index 6ea7fb0ea50e..5ddea4f54bf7 100644
--- a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
+++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
@@ -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],
--
2.15.1
next prev parent reply other threads:[~2017-12-05 2:39 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-04 6:17 [PATCH] staging: vc04_services: Fix trivial style issues Genki Sky
2017-12-04 7:31 ` Greg Kroah-Hartman
2017-12-04 10:52 ` Dan Carpenter
2017-12-05 2:39 ` [PATCH v2 0/3] " Genki Sky
2017-12-05 2:39 ` [PATCH v2 1/3] staging: vc04_services: Join multiline dereferences Genki Sky
2017-12-05 6:17 ` Greg Kroah-Hartman
2017-12-05 2:39 ` Genki Sky [this message]
2017-12-05 2:39 ` [PATCH v2 3/3] staging: vc04_services: Use __func__ Genki Sky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=30baaaf1f55a18f8ddc5eacb1f3a8193e553ea5b.1512441073.git.sky@genki.is \
--to=sky@genki.is \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.