git.librecmc.org Git - oweals/openwrt.git/blob

   1 From 59f1fbe55d6e5b878fd422cd969fbee7d5d9b78c Mon Sep 17 00:00:00 2001
   2 From: Genki Sky <sky@genki.is>
   3 Date: Tue, 5 Dec 2017 19:09:54 -0500
   4 Subject: [PATCH 390/454] staging: vc04_services: Unsplit user-visible strings
   5
   6 Commit 5ced5a899b405e09cc681b8a1a449815b66744c7 upstream.
   7
   8 This was found using checkpatch.pl's SPLIT_STRING warning. While joining
   9 these strings makes for long lines, the kernel codebase consistently
  10 does it this way to make user-visible strings easier to grep for.
  11
  12 Signed-off-by: Genki Sky <sky@genki.is>
  13 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  14 ---
  15  .../staging/vc04_services/bcm2835-camera/bcm2835-camera.c  | 7 +++----
  16  drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c  | 3 +--
  17  2 files changed, 4 insertions(+), 6 deletions(-)
  18
  19 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
  20 +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
  21 @@ -380,8 +380,7 @@ static void buffer_cb(struct vchiq_mmal_
  22                                 timestamp = ktime_add_us(dev->capture.kernel_start_ts,
  23                                                          runtime_us);
  24                                 v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
  25 -                                        "Convert start time %llu and %llu "
  26 -                                        "with offset %llu to %llu\n",
  27 +                                        "Convert start time %llu and %llu with offset %llu to %llu\n",
  28                                          ktime_to_ns(dev->capture.kernel_start_ts),
  29                                          dev->capture.vc_start_timestamp, pts,
  30                                          ktime_to_ns(timestamp));
  31 @@ -585,8 +584,8 @@ static int start_streaming(struct vb2_qu
  32             vchiq_mmal_port_enable(dev->instance, dev->capture.port, buffer_cb);
  33         if (ret) {
  34                 v4l2_err(&dev->v4l2_dev,
  35 -                       "Failed to enable capture port - error %d. "
  36 -                       "Disabling camera port again\n", ret);
  37 +                       "Failed to enable capture port - error %d. Disabling camera port again\n",
  38 +                       ret);
  39
  40                 vchiq_mmal_port_disable(dev->instance,
  41                                         dev->capture.camera_port);
  42 --- a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
  43 +++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
  44 @@ -1229,8 +1229,7 @@ static int port_action_handle(struct vch
  45
  46         ret = -rmsg->u.port_action_reply.status;
  47
  48 -       pr_debug("%s:result:%d component:0x%x port:%d action:%s(%d)" \
  49 -                " connect component:0x%x connect port:%d\n",
  50 +       pr_debug("%s:result:%d component:0x%x port:%d action:%s(%d) connect component:0x%x connect port:%d\n",
  51                  __func__,
  52                  ret, port->component->handle, port->handle,
  53                  port_action_type_names[action_type],