Commit 42e7b46e authored by Genki Sky's avatar Genki Sky Committed by Phil Elwell
Browse files

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: default avatarGenki Sky <sky@genki.is>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e15170bd

drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c

+3 −4
Original line number Diff line number Diff line
@@ -380,8 +380,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));
@@ -585,8 +584,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
Original line number Diff line number Diff line
@@ -1228,8 +1228,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],