diff options
Diffstat (limited to 'target/linux/bcm27xx/patches-5.4/950-0671-staging-mmal-vchiq-Fix-formatting-errors-in-mmal_par.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.4/950-0671-staging-mmal-vchiq-Fix-formatting-errors-in-mmal_par.patch | 116 |
1 files changed, 0 insertions, 116 deletions
diff --git a/target/linux/bcm27xx/patches-5.4/950-0671-staging-mmal-vchiq-Fix-formatting-errors-in-mmal_par.patch b/target/linux/bcm27xx/patches-5.4/950-0671-staging-mmal-vchiq-Fix-formatting-errors-in-mmal_par.patch deleted file mode 100644 index f428ce5e9f..0000000000 --- a/target/linux/bcm27xx/patches-5.4/950-0671-staging-mmal-vchiq-Fix-formatting-errors-in-mmal_par.patch +++ /dev/null @@ -1,116 +0,0 @@ -From 3319293da05e444e0673c1aba5507e539ccff043 Mon Sep 17 00:00:00 2001 -From: Naushir Patuck <naush@raspberrypi.com> -Date: Thu, 23 Apr 2020 10:12:24 +0100 -Subject: [PATCH] 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> ---- - .../bcm2835-camera/bcm2835-camera.c | 2 +- - .../vchiq-mmal/mmal-parameters.h | 46 +++++++++---------- - 2 files changed, 24 insertions(+), 24 deletions(-) - ---- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c -+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c -@@ -1523,7 +1523,7 @@ static int get_num_cameras(struct vchiq_ - { - 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; - ---- 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 */ -@@ -342,7 +342,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, -@@ -754,15 +754,15 @@ 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 { -- u32 port_id; -- u32 max_width; -- u32 max_height; -- u32 lens_present; -- u8 camera_name[MMAL_PARAMETER_CAMERA_INFO_MAX_STR_LEN]; -+struct mmal_parameter_camera_info_camera { -+ u32 port_id; -+ u32 max_width; -+ u32 max_height; -+ u32 lens_present; -+ 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, -@@ -770,16 +770,16 @@ enum mmal_parameter_camera_info_flash_ty - 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 { -- 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 { -+ u32 num_cameras; -+ u32 num_flashes; -+ 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]; - }; - |