mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
staging: vc04_services: Unsplit user-visible strings
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>
This commit is contained in:
parent
7260ea5fc3
commit
baaa3e09c4
2 changed files with 4 additions and 6 deletions
|
@ -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);
|
||||
|
|
|
@ -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],
|
||||
|
|
Loading…
Reference in a new issue