The CSS API uses a lot of nested anonymous structs defined in object
macros to assign default values to its data-structures. These have been
changed to use compound-literals and designated initializers to make
them more comprehensible and less fragile.
The compound-literals can also be used in assignment, which means we can
get rid of some temporary variables whose only purpose is to be
initialized by one of these anonymous structs and then serve as the
rvalue in an assignment expression.
Signed-off-by: Jeremy Sowden
---
.../hive_isp_css_common/input_formatter_global.h | 26 ++--
.../pci/atomisp2/css2400/ia_css_frame_public.h | 46 ---
.../atomisp/pci/atomisp2/css2400/ia_css_pipe.h | 150 +++--
.../pci/atomisp2/css2400/ia_css_pipe_public.h | 136 +--
.../atomisp/pci/atomisp2/css2400/ia_css_types.h| 78 +--
.../isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h | 134 +-
.../kernels/sdis/common/ia_css_sdis_common_types.h | 86 +---
.../isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c | 3 +-
.../runtime/binary/interface/ia_css_binary.h | 140 +--
.../atomisp2/css2400/runtime/binary/src/binary.c | 3 +-
.../isp_param/interface/ia_css_isp_param_types.h | 19 ++-
.../runtime/pipeline/interface/ia_css_pipeline.h | 30 ++---
.../css2400/runtime/pipeline/src/pipeline.c| 7 +-
.../media/atomisp/pci/atomisp2/css2400/sh_css.c| 22 +--
.../atomisp/pci/atomisp2/css2400/sh_css_legacy.h | 16 +--
.../atomisp/pci/atomisp2/css2400/sh_css_metrics.h | 26 ++--
16 files changed, 518 insertions(+), 404 deletions(-)
diff --git
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/input_formatter_global.h
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/input_formatter_global.h
index 5654d911db65..4ce352986296 100644
---
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/input_formatter_global.h
+++
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/input_formatter_global.h
@@ -108,19 +108,19 @@ struct input_formatter_cfg_s {
};
#define DEFAULT_IF_CONFIG \
-{ \
- 0, /* start_line */\
- 0, /* start_column */\
- 0, /* left_padding */\
- 0, /* cropped_height */\
- 0, /* cropped_width */\
- 0, /* deinterleaving */\
- 0, /*.buf_vecs */\
- 0, /* buf_start_index */\
- 0, /* buf_increment */\
- 0, /* buf_eol_offset */\
- false, /* is_yuv420_format */\
- false /* block_no_reqs */\
+(struct input_formatter_cfg_s) { \
+ .start_line = 0, \
+ .start_column = 0, \
+ .left_padding = 0, \
+ .cropped_height = 0, \
+ .cropped_width = 0, \
+ .deinterleaving = 0, \
+ .buf_vecs = 0, \
+ .buf_start_index= 0, \
+ .buf_increment = 0, \
+ .buf_eol_offset = 0, \
+ .is_yuv420_format = false, \
+ .block_no_reqs = false \
}
extern const hrt_address HIVE_IF_SRST_ADDRESS[N_INPUT_FORMATTER_ID];
diff --git
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_frame_public.h
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_frame_public.h
index ba7a076c3afa..634eca325f07 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_frame_public.h
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_frame_public.h
@@ -121,15 +121,19 @@ struct ia_css_frame_info {
};
#define IA_CSS_BINARY_DEFAULT_FRAME_INFO \
-{ \
- {0, /* width */ \
-0}, /* height */ \
- 0, /* padded_width */ \
- IA_CSS_FRAME_FORMAT_NUM, /* format */ \
- 0, /* raw_bit_depth */ \
- IA_CSS_BAYER_ORDER_NUM, /* raw_bayer_order */ \
- {0, /*start col */ \
-0}, /*start line */ \
+(struct ia_css_frame_info) { \
+ .res= (struct ia_css_resolution) { \
+ .width = 0, \
+ .height = 0 \
+ }, \
+ .padded_width = 0, \
+ .format = IA_CSS_FRAME_FORMAT_NUM, \
+ .raw_bit_depth = 0, \
+ .raw_bayer_order= IA_CSS_BAYER_ORDER_NUM, \
+ .crop_info = (struct ia_css_crop_info) { \
+ .start_column = 0, \
+ .start_line = 0 \
+ }, \
}
/**
@@ -190,18 +194,18 @@ struct ia_css_frame {
};
#define DEFAULT_FRAME \
-{ \
- IA_CSS_BINARY_DEFAULT_FRAME_INFO, /* info */ \
- 0,
