lkml.org 
[lkml]   [2020]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 10/50] staging: mmal-vchiq: Fix formatting errors in mmal_parameters.h
    Date
    From: Naushir Patuck <naush@raspberrypi.com>

    No functional changes in this commit.

    - Remove erroneous whitespace.
    - Remove _t postfix label on structs and enums.

    Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
    Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
    Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
    ---
    .../bcm2835-camera/bcm2835-camera.c | 2 +-
    .../vchiq-mmal/mmal-parameters.h | 32 +++++++++----------
    2 files changed, 17 insertions(+), 17 deletions(-)

    diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
    index 73b2354a6bb7..df90c1f9d148 100644
    --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
    +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
    @@ -1497,7 +1497,7 @@ static int get_num_cameras(struct vchiq_mmal_instance *instance,
    {
    int ret;
    struct vchiq_mmal_component *cam_info_component;
    - struct mmal_parameter_camera_info_t cam_info = {0};
    + struct mmal_parameter_camera_info cam_info = {0};
    u32 param_size = sizeof(cam_info);
    int i;

    diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
    index f4ac5a6149ea..a1e39b1b1701 100644
    --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
    +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
    @@ -23,21 +23,21 @@
    #define MMAL_PARAMETERS_H

    /** Common parameter ID group, used with many types of component. */
    -#define MMAL_PARAMETER_GROUP_COMMON (0 << 16)
    +#define MMAL_PARAMETER_GROUP_COMMON (0 << 16)
    /** Camera-specific parameter ID group. */
    -#define MMAL_PARAMETER_GROUP_CAMERA (1 << 16)
    +#define MMAL_PARAMETER_GROUP_CAMERA (1 << 16)
    /** Video-specific parameter ID group. */
    -#define MMAL_PARAMETER_GROUP_VIDEO (2 << 16)
    +#define MMAL_PARAMETER_GROUP_VIDEO (2 << 16)
    /** Audio-specific parameter ID group. */
    -#define MMAL_PARAMETER_GROUP_AUDIO (3 << 16)
    +#define MMAL_PARAMETER_GROUP_AUDIO (3 << 16)
    /** Clock-specific parameter ID group. */
    -#define MMAL_PARAMETER_GROUP_CLOCK (4 << 16)
    +#define MMAL_PARAMETER_GROUP_CLOCK (4 << 16)
    /** Miracast-specific parameter ID group. */
    -#define MMAL_PARAMETER_GROUP_MIRACAST (5 << 16)
    +#define MMAL_PARAMETER_GROUP_MIRACAST (5 << 16)

    /* Common parameters */
    enum mmal_parameter_common_type {
    - /**< Never a valid parameter ID */
    + /**< Never a valid parameter ID */
    MMAL_PARAMETER_UNUSED = MMAL_PARAMETER_GROUP_COMMON,

    /**< MMAL_PARAMETER_ENCODING_T */
    @@ -341,7 +341,7 @@ enum mmal_parameter_imagefx {
    MMAL_PARAM_IMAGEFX_CARTOON,
    };

    -enum MMAL_PARAM_FLICKERAVOID_T {
    +enum MMAL_PARAM_FLICKERAVOID {
    MMAL_PARAM_FLICKERAVOID_OFF,
    MMAL_PARAM_FLICKERAVOID_AUTO,
    MMAL_PARAM_FLICKERAVOID_50HZ,
    @@ -723,7 +723,7 @@ struct mmal_parameter_imagefx_parameters {
    #define MMAL_PARAMETER_CAMERA_INFO_MAX_FLASHES 2
    #define MMAL_PARAMETER_CAMERA_INFO_MAX_STR_LEN 16

    -struct mmal_parameter_camera_info_camera_t {
    +struct mmal_parameter_camera_info_camera {
    u32 port_id;
    u32 max_width;
    u32 max_height;
    @@ -731,7 +731,7 @@ struct mmal_parameter_camera_info_camera_t {
    u8 camera_name[MMAL_PARAMETER_CAMERA_INFO_MAX_STR_LEN];
    };

    -enum mmal_parameter_camera_info_flash_type_t {
    +enum mmal_parameter_camera_info_flash_type {
    /* Make values explicit to ensure they match values in config ini */
    MMAL_PARAMETER_CAMERA_INFO_FLASH_TYPE_XENON = 0,
    MMAL_PARAMETER_CAMERA_INFO_FLASH_TYPE_LED = 1,
    @@ -739,16 +739,16 @@ enum mmal_parameter_camera_info_flash_type_t {
    MMAL_PARAMETER_CAMERA_INFO_FLASH_TYPE_MAX = 0x7FFFFFFF
    };

    -struct mmal_parameter_camera_info_flash_t {
    - enum mmal_parameter_camera_info_flash_type_t flash_type;
    +struct mmal_parameter_camera_info_flash {
    + enum mmal_parameter_camera_info_flash_type flash_type;
    };

    -struct mmal_parameter_camera_info_t {
    +struct mmal_parameter_camera_info {
    u32 num_cameras;
    u32 num_flashes;
    - struct mmal_parameter_camera_info_camera_t
    - cameras[MMAL_PARAMETER_CAMERA_INFO_MAX_CAMERAS];
    - struct mmal_parameter_camera_info_flash_t
    + struct mmal_parameter_camera_info_camera
    + cameras[MMAL_PARAMETER_CAMERA_INFO_MAX_CAMERAS];
    + struct mmal_parameter_camera_info_flash
    flashes[MMAL_PARAMETER_CAMERA_INFO_MAX_FLASHES];
    };

    --
    2.27.0
    \
     
     \ /
      Last update: 2020-06-23 18:48    [W:4.347 / U:0.200 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site