git.openwrt.org Git - openwrt/staging/yousong.git/blob

   1 From 52499594ce8b48c434bed29062c8bbc15b96cc96 Mon Sep 17 00:00:00 2001
   2 From: Dave Stevenson <dave.stevenson@raspberrypi.org>
   3 Date: Wed, 21 Feb 2018 15:39:26 +0000
   4 Subject: [PATCH 400/454] staging: bcm2835-camera: Fix missing lines between
   5  items
   6
   7 Fix checkpatch errors for missing blank lines after variable
   8 or structure declarations.
   9
  10 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
  11 ---
  12  .../staging/vc04_services/bcm2835-camera/bcm2835-camera.h   | 1 +
  13  drivers/staging/vc04_services/bcm2835-camera/controls.c     | 2 ++
  14  drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c   | 6 ++++--
  15  3 files changed, 7 insertions(+), 2 deletions(-)
  16
  17 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h
  18 +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h
  19 @@ -133,6 +133,7 @@ int set_framerate_params(struct bm2835_m
  20                 (pix_fmt)->pixelformat, (pix_fmt)->bytesperline,        \
  21                 (pix_fmt)->sizeimage, (pix_fmt)->colorspace, (pix_fmt)->priv); \
  22  }
  23 +
  24  #define v4l2_dump_win_format(level, debug, dev, win_fmt, desc) \
  25  {      \
  26         v4l2_dbg(level, debug, dev,     \
  27 --- a/drivers/staging/vc04_services/bcm2835-camera/controls.c
  28 +++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c
  29 @@ -56,6 +56,7 @@ static const s64 ev_bias_qmenu[] = {
  30  static const s64 iso_qmenu[] = {
  31         0, 100000, 200000, 400000, 800000,
  32  };
  33 +
  34  static const uint32_t iso_values[] = {
  35         0, 100, 200, 400, 800,
  36  };
  37 @@ -1272,6 +1273,7 @@ int bm2835_mmal_init_controls(struct bm2
  38                                  * mismatches.
  39                                  */
  40                                 int i;
  41 +
  42                                 mask = 1 << V4L2_SCENE_MODE_NONE;
  43                                 for (i = 0;
  44                                      i < ARRAY_SIZE(scene_configs);
  45 --- a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
  46 +++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
  47 @@ -1886,10 +1886,12 @@ int vchiq_mmal_finalise(struct vchiq_mma
  48
  49  int vchiq_mmal_init(struct vchiq_mmal_instance **out_instance)
  50  {
  51 -       int status;
  52 -       struct vchiq_mmal_instance *instance;
  53         static VCHI_CONNECTION_T *vchi_connection;
  54 +
  55         static VCHI_INSTANCE_T vchi_instance;
  56 +
  57 +       struct vchiq_mmal_instance *instance;
  58 +       int status;
  59         SERVICE_CREATION_T params = {
  60                 .version                = VCHI_VERSION_EX(VC_MMAL_VER, VC_MMAL_MIN_VER),
  61                 .service_id             = VC_MMAL_SERVER_NAME,