target/linux/bcm27xx/patches-5.4/950-0680-staging-mmal-vchiq-Fix-formatting-errors-in-mmal_par.patch

   1 From 3319293da05e444e0673c1aba5507e539ccff043 Mon Sep 17 00:00:00 2001
   2 From: Naushir Patuck <naush@raspberrypi.com>
   3 Date: Thu, 23 Apr 2020 10:12:24 +0100
   4 Subject: [PATCH] staging: mmal-vchiq: Fix formatting errors in
   5  mmal_parameters.h
   6
   7 No functional changes in this commit.
   8
   9 - Remove erroneous whitespace.
  10 - Remove _t postfix label on structs and enums.
  11
  12 Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
  13 ---
  14  .../bcm2835-camera/bcm2835-camera.c           |  2 +-
  15  .../vchiq-mmal/mmal-parameters.h              | 46 +++++++++----------
  16  2 files changed, 24 insertions(+), 24 deletions(-)
  17
  18 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
  19 +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
  20 @@ -1523,7 +1523,7 @@ static int get_num_cameras(struct vchiq_
  21  {
  22         int ret;
  23         struct vchiq_mmal_component  *cam_info_component;
  24 -       struct mmal_parameter_camera_info_t cam_info = {0};
  25 +       struct mmal_parameter_camera_info cam_info = {0};
  26         u32 param_size = sizeof(cam_info);
  27         int i;
  28
  29 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
  30 +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
  31 @@ -23,21 +23,21 @@
  32  #define MMAL_PARAMETERS_H
  33
  34  /** Common parameter ID group, used with many types of component. */
  35 -#define MMAL_PARAMETER_GROUP_COMMON            (0 << 16)
  36 +#define MMAL_PARAMETER_GROUP_COMMON            (0 << 16)
  37  /** Camera-specific parameter ID group. */
  38 -#define MMAL_PARAMETER_GROUP_CAMERA            (1 << 16)
  39 +#define MMAL_PARAMETER_GROUP_CAMERA            (1 << 16)
  40  /** Video-specific parameter ID group. */
  41 -#define MMAL_PARAMETER_GROUP_VIDEO             (2 << 16)
  42 +#define MMAL_PARAMETER_GROUP_VIDEO             (2 << 16)
  43  /** Audio-specific parameter ID group. */
  44 -#define MMAL_PARAMETER_GROUP_AUDIO             (3 << 16)
  45 +#define MMAL_PARAMETER_GROUP_AUDIO             (3 << 16)
  46  /** Clock-specific parameter ID group. */
  47 -#define MMAL_PARAMETER_GROUP_CLOCK             (4 << 16)
  48 +#define MMAL_PARAMETER_GROUP_CLOCK             (4 << 16)
  49  /** Miracast-specific parameter ID group. */
  50 -#define MMAL_PARAMETER_GROUP_MIRACAST       (5 << 16)
  51 +#define MMAL_PARAMETER_GROUP_MIRACAST          (5 << 16)
  52
  53  /* Common parameters */
  54  enum mmal_parameter_common_type {
  55 -               /**< Never a valid parameter ID */
  56 +       /**< Never a valid parameter ID */
  57         MMAL_PARAMETER_UNUSED = MMAL_PARAMETER_GROUP_COMMON,
  58
  59                 /**< MMAL_PARAMETER_ENCODING_T */
  60 @@ -342,7 +342,7 @@ enum mmal_parameter_imagefx {
  61         MMAL_PARAM_IMAGEFX_CARTOON,
  62  };
  63
  64 -enum MMAL_PARAM_FLICKERAVOID_T {
  65 +enum MMAL_PARAM_FLICKERAVOID {
  66         MMAL_PARAM_FLICKERAVOID_OFF,
  67         MMAL_PARAM_FLICKERAVOID_AUTO,
  68         MMAL_PARAM_FLICKERAVOID_50HZ,
  69 @@ -754,15 +754,15 @@ struct mmal_parameter_imagefx_parameters
  70  #define MMAL_PARAMETER_CAMERA_INFO_MAX_FLASHES 2
  71  #define MMAL_PARAMETER_CAMERA_INFO_MAX_STR_LEN 16
  72
  73 -struct mmal_parameter_camera_info_camera_t {
  74 -       u32    port_id;
  75 -       u32    max_width;
  76 -       u32    max_height;
  77 -       u32    lens_present;
  78 -       u8     camera_name[MMAL_PARAMETER_CAMERA_INFO_MAX_STR_LEN];
  79 +struct mmal_parameter_camera_info_camera {
  80 +       u32 port_id;
  81 +       u32 max_width;
  82 +       u32 max_height;
  83 +       u32 lens_present;
  84 +       u8 camera_name[MMAL_PARAMETER_CAMERA_INFO_MAX_STR_LEN];
  85  };
  86
  87 -enum mmal_parameter_camera_info_flash_type_t {
  88 +enum mmal_parameter_camera_info_flash_type {
  89         /* Make values explicit to ensure they match values in config ini */
  90         MMAL_PARAMETER_CAMERA_INFO_FLASH_TYPE_XENON = 0,
  91         MMAL_PARAMETER_CAMERA_INFO_FLASH_TYPE_LED   = 1,
  92 @@ -770,16 +770,16 @@ enum mmal_parameter_camera_info_flash_ty
  93         MMAL_PARAMETER_CAMERA_INFO_FLASH_TYPE_MAX = 0x7FFFFFFF
  94  };
  95
  96 -struct mmal_parameter_camera_info_flash_t {
  97 -       enum mmal_parameter_camera_info_flash_type_t flash_type;
  98 +struct mmal_parameter_camera_info_flash {
  99 +       enum mmal_parameter_camera_info_flash_type flash_type;
 100  };
 101
 102 -struct mmal_parameter_camera_info_t {
 103 -       u32                            num_cameras;
 104 -       u32                            num_flashes;
 105 -       struct mmal_parameter_camera_info_camera_t
 106 -                               cameras[MMAL_PARAMETER_CAMERA_INFO_MAX_CAMERAS];
 107 -       struct mmal_parameter_camera_info_flash_t
 108 +struct mmal_parameter_camera_info {
 109 +       u32 num_cameras;
 110 +       u32 num_flashes;
 111 +       struct mmal_parameter_camera_info_camera
 112 +               cameras[MMAL_PARAMETER_CAMERA_INFO_MAX_CAMERAS];
 113 +       struct mmal_parameter_camera_info_flash
 114                                 flashes[MMAL_PARAMETER_CAMERA_INFO_MAX_FLASHES];
 115  };
 116