Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: mmal-vchiq: Fix formatting errors in mmal_parameters.h

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>
Link: https://lore.kernel.org/r/20200629150945.10720-8-nsaenzjulienne@suse.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Naushir Patuck and committed by
Greg Kroah-Hartman
3dad90c5 7c71d489

+17 -17
+1 -1
drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
··· 1497 1497 { 1498 1498 int ret; 1499 1499 struct vchiq_mmal_component *cam_info_component; 1500 - struct mmal_parameter_camera_info_t cam_info = {0}; 1500 + struct mmal_parameter_camera_info cam_info = {0}; 1501 1501 u32 param_size = sizeof(cam_info); 1502 1502 int i; 1503 1503
+16 -16
drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h
··· 23 23 #define MMAL_PARAMETERS_H 24 24 25 25 /** Common parameter ID group, used with many types of component. */ 26 - #define MMAL_PARAMETER_GROUP_COMMON (0 << 16) 26 + #define MMAL_PARAMETER_GROUP_COMMON (0 << 16) 27 27 /** Camera-specific parameter ID group. */ 28 - #define MMAL_PARAMETER_GROUP_CAMERA (1 << 16) 28 + #define MMAL_PARAMETER_GROUP_CAMERA (1 << 16) 29 29 /** Video-specific parameter ID group. */ 30 - #define MMAL_PARAMETER_GROUP_VIDEO (2 << 16) 30 + #define MMAL_PARAMETER_GROUP_VIDEO (2 << 16) 31 31 /** Audio-specific parameter ID group. */ 32 - #define MMAL_PARAMETER_GROUP_AUDIO (3 << 16) 32 + #define MMAL_PARAMETER_GROUP_AUDIO (3 << 16) 33 33 /** Clock-specific parameter ID group. */ 34 - #define MMAL_PARAMETER_GROUP_CLOCK (4 << 16) 34 + #define MMAL_PARAMETER_GROUP_CLOCK (4 << 16) 35 35 /** Miracast-specific parameter ID group. */ 36 - #define MMAL_PARAMETER_GROUP_MIRACAST (5 << 16) 36 + #define MMAL_PARAMETER_GROUP_MIRACAST (5 << 16) 37 37 38 38 /* Common parameters */ 39 39 enum mmal_parameter_common_type { 40 - /**< Never a valid parameter ID */ 40 + /**< Never a valid parameter ID */ 41 41 MMAL_PARAMETER_UNUSED = MMAL_PARAMETER_GROUP_COMMON, 42 42 43 43 /**< MMAL_PARAMETER_ENCODING_T */ ··· 341 341 MMAL_PARAM_IMAGEFX_CARTOON, 342 342 }; 343 343 344 - enum MMAL_PARAM_FLICKERAVOID_T { 344 + enum MMAL_PARAM_FLICKERAVOID { 345 345 MMAL_PARAM_FLICKERAVOID_OFF, 346 346 MMAL_PARAM_FLICKERAVOID_AUTO, 347 347 MMAL_PARAM_FLICKERAVOID_50HZ, ··· 723 723 #define MMAL_PARAMETER_CAMERA_INFO_MAX_FLASHES 2 724 724 #define MMAL_PARAMETER_CAMERA_INFO_MAX_STR_LEN 16 725 725 726 - struct mmal_parameter_camera_info_camera_t { 726 + struct mmal_parameter_camera_info_camera { 727 727 u32 port_id; 728 728 u32 max_width; 729 729 u32 max_height; ··· 731 731 u8 camera_name[MMAL_PARAMETER_CAMERA_INFO_MAX_STR_LEN]; 732 732 }; 733 733 734 - enum mmal_parameter_camera_info_flash_type_t { 734 + enum mmal_parameter_camera_info_flash_type { 735 735 /* Make values explicit to ensure they match values in config ini */ 736 736 MMAL_PARAMETER_CAMERA_INFO_FLASH_TYPE_XENON = 0, 737 737 MMAL_PARAMETER_CAMERA_INFO_FLASH_TYPE_LED = 1, ··· 739 739 MMAL_PARAMETER_CAMERA_INFO_FLASH_TYPE_MAX = 0x7FFFFFFF 740 740 }; 741 741 742 - struct mmal_parameter_camera_info_flash_t { 743 - enum mmal_parameter_camera_info_flash_type_t flash_type; 742 + struct mmal_parameter_camera_info_flash { 743 + enum mmal_parameter_camera_info_flash_type flash_type; 744 744 }; 745 745 746 - struct mmal_parameter_camera_info_t { 746 + struct mmal_parameter_camera_info { 747 747 u32 num_cameras; 748 748 u32 num_flashes; 749 - struct mmal_parameter_camera_info_camera_t 750 - cameras[MMAL_PARAMETER_CAMERA_INFO_MAX_CAMERAS]; 751 - struct mmal_parameter_camera_info_flash_t 749 + struct mmal_parameter_camera_info_camera 750 + cameras[MMAL_PARAMETER_CAMERA_INFO_MAX_CAMERAS]; 751 + struct mmal_parameter_camera_info_flash 752 752 flashes[MMAL_PARAMETER_CAMERA_INFO_MAX_FLASHES]; 753 753 }; 754 754