Re: [PATCH v4 1/3] media: atomisp: convert default struct values to use compound-literals with designated initializers.
On 2017-12-19, at 14:07:49 +0200, Sakari Ailus wrote: > On Sat, Dec 02, 2017 at 10:11:59PM +0000, Jeremy Sowden wrote: > > 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 <jer...@azazel.net> > > I don't think it's useful to change the struct definition macros only > to remove a large number of assigned fields in the next patch. How > about merging the two patches? I squashed all three, as you suggested. > Please also start a new thread when re-posting a set. Done. J. signature.asc Description: PGP signature
[PATCH] media: atomisp: convert default struct values to use compound-literals with designated initializers.
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.
A lot of the members of the default struct values used by the CSS API
were explicitly initialized to zero values. Designated initializers
have allowed these members, and in some case whole default struct
values, to be removed.
Signed-off-by: Jeremy Sowden <jer...@azazel.net>
---
.../hive_isp_css_common/input_formatter_global.h | 16 ---
.../pci/atomisp2/css2400/ia_css_frame_public.h | 29 ++
.../atomisp/pci/atomisp2/css2400/ia_css_pipe.h | 113 -
.../pci/atomisp2/css2400/ia_css_pipe_public.h | 108 +++-
.../atomisp/pci/atomisp2/css2400/ia_css_types.h| 64 +++-
.../isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h | 50 +
.../kernels/sdis/common/ia_css_sdis_common_types.h | 31 ++
.../isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c | 3 +-
.../runtime/binary/interface/ia_css_binary.h | 88 ++--
.../atomisp2/css2400/runtime/binary/src/binary.c | 3 +-
.../isp_param/interface/ia_css_isp_param_types.h | 10 --
.../runtime/pipeline/interface/ia_css_pipeline.h | 24 ++---
.../css2400/runtime/pipeline/src/pipeline.c| 7 +-
.../media/atomisp/pci/atomisp2/css2400/sh_css.c| 31 ++
.../atomisp/pci/atomisp2/css2400/sh_css_legacy.h | 11 --
.../atomisp/pci/atomisp2/css2400/sh_css_metrics.h | 21
16 files changed, 116 insertions(+), 493 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..7558f4964313 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
@@ -107,22 +107,6 @@ struct input_formatter_cfg_s {
uint32_tblock_no_reqs;
};
-#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 */\
-}
-
extern const hrt_address HIVE_IF_SRST_ADDRESS[N_INPUT_FORMATTER_ID];
extern const hrt_data HIVE_IF_SRST_MASK[N_INPUT_FORMATTER_ID];
extern const uint8_t HIVE_IF_SWITCH_CODE[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..0beb7347a4f3 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,9 @@ 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) { \
+ .format = IA_CSS_FRAME_FORMAT_NUM, \
+ .raw_bayer_order= IA_CSS_BAYER_ORDER_NUM, \
}
/**
@@ -190,18 +184,11 @@ struct ia_css_frame {
};
#define DEFAULT_FRAME \
-{ \
- IA_CSS_BINARY_DEFAULT_FRAME_INFO, /* info */ \
- 0, /* data */ \
- 0, /* data_bytes */ \
- SH_CSS_INVALID_QUEUE_ID,/* dynamic_data_index */ \
- IA_CSS_BUFFER_TYPE_INVALID, /* buf_type */ \
- IA_CSS_FRAME_FLASH_STATE_NONE, /* flash_state */ \
- 0, /* exp_id */ \
- 0, /* isp_config_id */ \
- false, /* valid */ \
- false, /* contiguous */ \
-
Re: [PATCH v2 1/3] media: atomisp: convert default struct values to use compound-literals with designated initializers.
On 2017-12-03, at 08:39:21 +0300, Dan Carpenter wrote:
> On Sat, Dec 02, 2017 at 08:41:48PM +0000, Jeremy Sowden wrote:
> > On 2017-12-02, at 10:35:06 +0000, Jeremy Sowden wrote:
> > > On 2017-12-02, at 13:20:09 +0300, Dan Carpenter wrote:
> > > > On Fri, Dec 01, 2017 at 05:19:37PM +, Jeremy Sowden wrote:
> > > > > -#define DEFAULT_PIPE_INFO \
> > > > > -{ \
> > > > > - {IA_CSS_BINARY_DEFAULT_FRAME_INFO}, /* output_info */ \
> > > > > - {IA_CSS_BINARY_DEFAULT_FRAME_INFO}, /* vf_output_info */ \
> > > > > - IA_CSS_BINARY_DEFAULT_FRAME_INFO, /* raw_output_info */ \
> > > > > - { 0, 0},/* output system in res
> > > > > */ \
> > > > > - DEFAULT_SHADING_INFO, /* shading_info */ \
> > > > > - DEFAULT_GRID_INFO, /* grid_info */ \
> > > > > - 0 /* num_invalid_frames
> > > > > */ \
> > > > > -}
> > > > > +#define DEFAULT_PIPE_INFO ( \
> > > >
> > > > Why does this have a ( now? That can't compile can it??
> > >
> > > It does.
> >
> > That was a bit terse: the macros expand to compound-literals, so
> > putting parens around them is no different from:
> >
> > #define THREE (3)
>
> Yeah. Thanks. I figured it out despite the terseness... I try
> review as fast as I can, so it means you get the stream of
> conciousness output that often has mistakes. Sorry about that.
No worries. The feedback has been very helpful.
J.
signature.asc
Description: PGP signature
[PATCH v4 3/3] media: atomisp: delete empty default struct values.
Removing zero-valued struct-members left a number of the default
struct-values empty. These values have now been removed.
Signed-off-by: Jeremy Sowden <jer...@azazel.net>
---
.../atomisp/pci/atomisp2/css2400/ia_css_pipe.h | 1 -
.../atomisp/pci/atomisp2/css2400/ia_css_types.h| 1 -
.../isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h | 5 ---
.../kernels/sdis/common/ia_css_sdis_common_types.h | 41 --
.../isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c | 2 +-
.../runtime/binary/interface/ia_css_binary.h | 8 -
.../isp_param/interface/ia_css_isp_param_types.h | 12 ---
.../media/atomisp/pci/atomisp2/css2400/sh_css.c| 9 +++--
.../atomisp/pci/atomisp2/css2400/sh_css_legacy.h | 4 ---
.../atomisp/pci/atomisp2/css2400/sh_css_metrics.h | 10 --
10 files changed, 12 insertions(+), 81 deletions(-)
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe.h
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe.h
index 522238ec8899..f6870fa7a18c 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe.h
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe.h
@@ -163,7 +163,6 @@ struct ia_css_pipe {
#define IA_CSS_DEFAULT_PIPE \
(struct ia_css_pipe) { \
.config = DEFAULT_PIPE_CONFIG, \
- .extra_config = DEFAULT_PIPE_EXTRA_CONFIG, \
.info = DEFAULT_PIPE_INFO, \
.mode = IA_CSS_PIPE_ID_ACC, /* (pipe_id) */ \
.pipeline = DEFAULT_PIPELINE, \
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_types.h
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_types.h
index a0ddf989fadf..259ab3f074ba 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_types.h
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_types.h
@@ -407,7 +407,6 @@ struct ia_css_grid_info {
/* defaults for ia_css_grid_info structs */
#define DEFAULT_GRID_INFO \
(struct ia_css_grid_info) { \
- .s3a_grid = DEFAULT_3A_GRID_INFO, \
.dvs_grid = DEFAULT_DVS_GRID_INFO, \
.vamem_type = IA_CSS_VAMEM_TYPE_1 \
}
diff --git
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h
index 988a0e272225..63e70669f085 100644
---
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h
+++
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h
@@ -98,11 +98,6 @@ struct ia_css_3a_grid_info {
};
-#define DEFAULT_3A_GRID_INFO \
-(struct ia_css_3a_grid_info) { \
-}
-
-
/* This struct should be split into 3, for AE, AWB and AF.
* However, that will require driver/ 3A lib modifications.
*/
diff --git
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/common/ia_css_sdis_common_types.h
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/common/ia_css_sdis_common_types.h
index e867dadd8a83..381e5730d405 100644
---
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/common/ia_css_sdis_common_types.h
+++
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/common/ia_css_sdis_common_types.h
@@ -41,11 +41,6 @@ struct ia_css_sdis_info {
uint32_t deci_factor_log2;
};
-#define IA_CSS_DEFAULT_SDIS_INFO \
-(struct ia_css_sdis_info) { \
-}
-
-
/* DVS statistics grid
*
* ISP block: SDVS1 (DIS/DVS Support for DIS/DVS ver.1 (2-axes))
@@ -200,37 +195,15 @@ struct ia_css_dvs_stat_grid_info {
/* DVS statistics generated by accelerator default grid info
*/
-#define DEFAULT_DVS_STAT_PUBLIC_DVS_GLOBAL_CFG \
-(struct dvs_stat_public_dvs_global_cfg) { \
-}
-
-#define DEFAULT_DVS_STAT_PUBLIC_DVS_GRD_CFG \
-(struct dvs_stat_public_dvs_grd_cfg) { \
-}
-
-#define DEFAULT_DVS_STAT_PUBLIC_DVS_LEVEL_FE_ROI_CFG(X_START) \
-(struct dvs_stat_public_dvs_level_fe_roi_cfg) { \
- .x_start = X_START, \
-}
-
-#define DEFAULT_DVS_STAT_GRID_INFO \
-(struct ia_css_dvs_stat_grid_info) { \
- .dvs_gbl_cfg = DEFAULT_DVS_STAT_PUBLIC_DVS_GLOBAL_CFG, \
- .grd_cfg = { \
- DEFAULT_DVS_STAT_PUBLIC_DVS_GRD_CFG, \
- DEFAULT_DVS_STAT_PUBLIC_DVS_GRD_CFG, \
- DEFAULT_DVS_STAT_PUBLIC_DVS_GRD_CFG \
- }, \
- .fe_roi_cfg = { \
- DEFAULT_DVS_STAT_PUBLIC_DVS_LEVEL_FE_ROI_CFG(0), \
- DEFAULT_DVS_STAT_PUBLIC_DVS_LEVEL_FE_ROI_CFG(4), \
- DEFAULT_DVS_STAT_PUBLIC_DVS_LEVEL_FE_ROI_CFG(0), \
- } \
-}
-
#define DEFAULT_DVS_GRID_INFO \
(union ia_css_dvs_grid_u) { \
- .dvs_stat_grid_info = DEFAULT_DVS_STAT_GRID_INFO, \
+ .dvs_stat_grid_info = (struct ia_css_dvs_stat_grid_info) { \
+ .fe_roi_cfg = { \
+ [1] = (
[PATCH v4 1/3] media: atomisp: convert default struct values to use compound-literals with designated initializers.
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 <jer...@azazel.net>
---
.../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_FRAM
[PATCH v4 2/3] media: atomisp: delete zero-valued struct members.
A lot of the members of the default struct values used by the CSS API
were explicitly initialized to zero values. Designated initializers
have allowed these members to be removed.
Signed-off-by: Jeremy Sowden <jer...@azazel.net>
---
.../hive_isp_css_common/input_formatter_global.h | 16 ---
.../pci/atomisp2/css2400/ia_css_frame_public.h | 17
.../atomisp/pci/atomisp2/css2400/ia_css_pipe.h | 44 +
.../pci/atomisp2/css2400/ia_css_pipe_public.h | 78 ---
.../atomisp/pci/atomisp2/css2400/ia_css_types.h| 47 +
.../isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h | 109 -
.../kernels/sdis/common/ia_css_sdis_common_types.h | 34 ---
.../runtime/binary/interface/ia_css_binary.h | 88 ++---
.../isp_param/interface/ia_css_isp_param_types.h | 9 --
.../runtime/pipeline/interface/ia_css_pipeline.h | 6 --
.../atomisp/pci/atomisp2/css2400/sh_css_legacy.h | 7 --
.../atomisp/pci/atomisp2/css2400/sh_css_metrics.h | 7 --
12 files changed, 20 insertions(+), 442 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 4ce352986296..7558f4964313 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
@@ -107,22 +107,6 @@ struct input_formatter_cfg_s {
uint32_tblock_no_reqs;
};
-#define DEFAULT_IF_CONFIG \
-(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];
extern const hrt_data HIVE_IF_SRST_MASK[N_INPUT_FORMATTER_ID];
extern const uint8_t HIVE_IF_SWITCH_CODE[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 634eca325f07..0beb7347a4f3 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
@@ -122,18 +122,8 @@ struct ia_css_frame_info {
#define IA_CSS_BINARY_DEFAULT_FRAME_INFO \
(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 \
- }, \
}
/**
@@ -196,16 +186,9 @@ struct ia_css_frame {
#define DEFAULT_FRAME \
(struct ia_css_frame) { \
.info = IA_CSS_BINARY_DEFAULT_FRAME_INFO, \
- .data = 0, \
- .data_bytes = 0, \
.dynamic_queue_id = SH_CSS_INVALID_QUEUE_ID, \
.buf_type = IA_CSS_BUFFER_TYPE_INVALID, \
.flash_state= IA_CSS_FRAME_FLASH_STATE_NONE, \
- .exp_id = 0, \
- .isp_config_id = 0, \
- .valid = false, \
- .contiguous = false, \
- .planes = { 0 } \
}
/* @brief Fill a frame with zeros
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe.h
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe.h
index fa5e3f6b85a8..522238ec8899 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe.h
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe.h
@@ -39,16 +39,11 @@ struct ia_css_preview_settings {
struct ia_css_pipe *acc_pipe;
};
-#define IA_CSS_DEFAULT_PREVIEW_SETTINGS \
+#define IA_CSS_DEFAULT_PREVIEW_SETTINGS \
(struct ia_css_preview_settings) { \
.copy_binary= IA_CSS_BINARY_DEFAULT_SETTINGS, \
.preview_binary = IA_CSS_BINARY_DEFAULT_SETTINGS, \
.vf_pp_binary = IA_CSS_BINARY_DEFAULT_SETTINGS, \
- .delay_frames = { NULL }, \
- .tnr_
[PATCH v4 0/3] media: atomisp: clean up of data-structure initialization in the CSS API
v4. Removed the parens around the compound-literals in the macro definitions. They were superfluous and the errors reported by checkpatch.pl appear to have been false positives resulting from a bug. v3. Rebased on to git://linuxtv.org/media_tree.git. Patch-set applies cleanly to linux-next as of 20171201. v2. Fixed a couple of bugs and addressed checkpatch errors. v1. 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 made it possible 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. The designated initializers also allow the removal of lots of struct-members initialized to zero values. I made the changes in three stages: firstly, I converted the default values to compound-literals and designated initializers and removed the temporary variables; secondly, I removed the zero-valued struct-members; finally, I removed some structs which had become empty. Jeremy Sowden (3): media: atomisp: convert default struct values to use compound-literals with designated initializers. media: atomisp: delete zero-valued struct members. media: atomisp: delete empty default struct values. .../hive_isp_css_common/input_formatter_global.h | 16 --- .../pci/atomisp2/css2400/ia_css_frame_public.h | 29 ++ .../atomisp/pci/atomisp2/css2400/ia_css_pipe.h | 113 - .../pci/atomisp2/css2400/ia_css_pipe_public.h | 108 +++- .../atomisp/pci/atomisp2/css2400/ia_css_types.h| 64 +++- .../isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h | 50 + .../kernels/sdis/common/ia_css_sdis_common_types.h | 31 ++ .../isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c | 3 +- .../runtime/binary/interface/ia_css_binary.h | 88 ++-- .../atomisp2/css2400/runtime/binary/src/binary.c | 3 +- .../isp_param/interface/ia_css_isp_param_types.h | 10 -- .../runtime/pipeline/interface/ia_css_pipeline.h | 24 ++--- .../css2400/runtime/pipeline/src/pipeline.c| 7 +- .../media/atomisp/pci/atomisp2/css2400/sh_css.c| 31 ++ .../atomisp/pci/atomisp2/css2400/sh_css_legacy.h | 11 -- .../atomisp/pci/atomisp2/css2400/sh_css_metrics.h | 21 16 files changed, 116 insertions(+), 493 deletions(-) base-commit: 781b045baefdabf7e0bc9f33672ca830d3db9f27 -- 2.15.0
Re: [PATCH v2 1/3] media: atomisp: convert default struct values to use compound-literals with designated initializers.
On 2017-12-02, at 20:41:48 +, Jeremy Sowden wrote:
> On 2017-12-02, at 10:35:06 +0000, Jeremy Sowden wrote:
> > On 2017-12-02, at 13:20:09 +0300, Dan Carpenter wrote:
> > > On Fri, Dec 01, 2017 at 05:19:37PM +0000, Jeremy Sowden wrote:
> > > > -#define DEFAULT_PIPE_INFO \
> > > > -{ \
> > > > - {IA_CSS_BINARY_DEFAULT_FRAME_INFO}, /* output_info */ \
> > > > - {IA_CSS_BINARY_DEFAULT_FRAME_INFO}, /* vf_output_info */ \
> > > > - IA_CSS_BINARY_DEFAULT_FRAME_INFO, /* raw_output_info */ \
> > > > - { 0, 0},/* output system in res
> > > > */ \
> > > > - DEFAULT_SHADING_INFO, /* shading_info */ \
> > > > - DEFAULT_GRID_INFO, /* grid_info */ \
> > > > - 0 /* num_invalid_frames
> > > > */ \
> > > > -}
> > > > +#define DEFAULT_PIPE_INFO ( \
> > >
> > > Why does this have a ( now? That can't compile can it??
> > >
> > > > + (struct ia_css_pipe_info) { \
> > > > + .output_info=
> > > > {IA_CSS_BINARY_DEFAULT_FRAME_INFO}, \
> > > > + .vf_output_info =
> > > > {IA_CSS_BINARY_DEFAULT_FRAME_INFO}, \
> > > > + .raw_output_info=
> > > > IA_CSS_BINARY_DEFAULT_FRAME_INFO, \
> > > > + .output_system_in_res_info = { 0, 0 }, \
> > > > + .shading_info = DEFAULT_SHADING_INFO,
> > > > \
> > > > + .grid_info = DEFAULT_GRID_INFO, \
> > > > + .num_invalid_frames = 0 \
> > > > + } \
> > > > +)
> >
> > Checkpatch got quite shouty, e.g.:
> >
> > ERROR: Macros with complex values should be enclosed in parentheses
> > #826: FILE:
> > drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/common/ia_css_sdis_common_types.h:215:
> > +#define DEFAULT_DVS_STAT_PUBLIC_DVS_GLOBAL_CFG \
> > +(struct dvs_stat_public_dvs_global_cfg) { \
> > + .kappa = 0, \
> > + .match_shift= 0, \
> > + .ybin_mode = 0, \
> > +}
> >
> > so I just wrapped all of them.
>
> I've run checkpatch.pl against the unparenthesized patches, and it
> only objects to some of the macros. I've also taken a look at the
> source of checkpatch.pl itself, and at first glance it appears that it
> should accept them. I'll see if I can work out why it's complaining.
I think I've found a bug in checkpatch.pl. I'll remove the parentheses
from my patches 'cause the error-reportd appear to be bogus, and pass on
my findings.
J.
signature.asc
Description: PGP signature
Re: [PATCH v2 1/3] media: atomisp: convert default struct values to use compound-literals with designated initializers.
On 2017-12-02, at 10:35:06 +, Jeremy Sowden wrote:
> On 2017-12-02, at 13:20:09 +0300, Dan Carpenter wrote:
> > On Fri, Dec 01, 2017 at 05:19:37PM +0000, Jeremy Sowden wrote:
> > > -#define DEFAULT_PIPE_INFO \
> > > -{ \
> > > - {IA_CSS_BINARY_DEFAULT_FRAME_INFO}, /* output_info */ \
> > > - {IA_CSS_BINARY_DEFAULT_FRAME_INFO}, /* vf_output_info */ \
> > > - IA_CSS_BINARY_DEFAULT_FRAME_INFO, /* raw_output_info */ \
> > > - { 0, 0},/* output system in res */ \
> > > - DEFAULT_SHADING_INFO, /* shading_info */ \
> > > - DEFAULT_GRID_INFO, /* grid_info */ \
> > > - 0 /* num_invalid_frames */ \
> > > -}
> > > +#define DEFAULT_PIPE_INFO ( \
> >
> > Why does this have a ( now? That can't compile can it??
>
> It does.
That was a bit terse: the macros expand to compound-literals, so
putting parens around them is no different from:
#define THREE (3)
It's also superfluous, of course.
> > > + (struct ia_css_pipe_info) { \
> > > + .output_info=
> > > {IA_CSS_BINARY_DEFAULT_FRAME_INFO}, \
> > > + .vf_output_info =
> > > {IA_CSS_BINARY_DEFAULT_FRAME_INFO}, \
> > > + .raw_output_info=
> > > IA_CSS_BINARY_DEFAULT_FRAME_INFO, \
> > > + .output_system_in_res_info = { 0, 0 }, \
> > > + .shading_info = DEFAULT_SHADING_INFO, \
> > > + .grid_info = DEFAULT_GRID_INFO, \
> > > + .num_invalid_frames = 0 \
> > > + } \
> > > +)
>
> Checkpatch got quite shouty, e.g.:
>
> ERROR: Macros with complex values should be enclosed in parentheses
> #826: FILE:
> drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/common/ia_css_sdis_common_types.h:215:
> +#define DEFAULT_DVS_STAT_PUBLIC_DVS_GLOBAL_CFG \
> +(struct dvs_stat_public_dvs_global_cfg) { \
> + .kappa = 0, \
> + .match_shift= 0, \
> + .ybin_mode = 0, \
> +}
>
> so I just wrapped all of them.
I've run checkpatch.pl against the unparenthesized patches, and it only
objects to some of the macros. I've also taken a look at the source of
checkpatch.pl itself, and at first glance it appears that it should
accept them. I'll see if I can work out why it's complaining.
J.
signature.asc
Description: PGP signature
Re: [PATCH v2 2/3] media: atomisp: delete zero-valued struct members.
On 2017-12-01, at 17:41:50 +, Alan Cox wrote:
> > ---
> > a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe_public.h
> > +++
> > b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe_public.h
> > @@ -152,14 +152,6 @@ struct ia_css_pipe_config {
> > };
> >
>
>
> Thani you that's a really good cleanup.
Thanks. :)
J.
signature.asc
Description: PGP signature
Re: [PATCH v2 1/3] media: atomisp: convert default struct values to use compound-literals with designated initializers.
On 2017-12-02, at 13:20:09 +0300, Dan Carpenter wrote:
> On Fri, Dec 01, 2017 at 05:19:37PM +0000, Jeremy Sowden wrote:
> > -#define DEFAULT_PIPE_INFO \
> > -{ \
> > - {IA_CSS_BINARY_DEFAULT_FRAME_INFO}, /* output_info */ \
> > - {IA_CSS_BINARY_DEFAULT_FRAME_INFO}, /* vf_output_info */ \
> > - IA_CSS_BINARY_DEFAULT_FRAME_INFO, /* raw_output_info */ \
> > - { 0, 0},/* output system in res */ \
> > - DEFAULT_SHADING_INFO, /* shading_info */ \
> > - DEFAULT_GRID_INFO, /* grid_info */ \
> > - 0 /* num_invalid_frames */ \
> > -}
> > +#define DEFAULT_PIPE_INFO ( \
>
> Why does this have a ( now? That can't compile can it??
It does.
> > + (struct ia_css_pipe_info) { \
> > + .output_info=
> > {IA_CSS_BINARY_DEFAULT_FRAME_INFO}, \
> > + .vf_output_info =
> > {IA_CSS_BINARY_DEFAULT_FRAME_INFO}, \
> > + .raw_output_info=
> > IA_CSS_BINARY_DEFAULT_FRAME_INFO, \
> > + .output_system_in_res_info = { 0, 0 }, \
> > + .shading_info = DEFAULT_SHADING_INFO, \
> > + .grid_info = DEFAULT_GRID_INFO, \
> > + .num_invalid_frames = 0 \
> > + } \
> > +)
Checkpatch got quite shouty, e.g.:
ERROR: Macros with complex values should be enclosed in parentheses
#826: FILE:
drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/common/ia_css_sdis_common_types.h:215:
+#define DEFAULT_DVS_STAT_PUBLIC_DVS_GLOBAL_CFG \
+(struct dvs_stat_public_dvs_global_cfg) { \
+ .kappa = 0, \
+ .match_shift= 0, \
+ .ybin_mode = 0, \
+}
so I just wrapped all of them.
> We need to get better compile test coverage on this... :/ There are
> some others as well.
I have run a test-compilation. Some of the code doesn't get built
because it's #ifdeffed off. I did try adding -DISP2401 (which enables
most of it), that that just causes unrelated compilation failures.
J.
signature.asc
Description: PGP signature
[PATCH v3 3/3] media: atomisp: delete empty default struct values.
Removing zero-valued struct-members left a number of the default
struct-values empty. These values have now been removed.
Signed-off-by: Jeremy Sowden <jer...@azazel.net>
---
.../atomisp/pci/atomisp2/css2400/ia_css_pipe.h | 1 -
.../atomisp/pci/atomisp2/css2400/ia_css_types.h| 1 -
.../isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h | 6 ---
.../kernels/sdis/common/ia_css_sdis_common_types.h | 46 --
.../isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c | 2 +-
.../runtime/binary/interface/ia_css_binary.h | 9 -
.../isp_param/interface/ia_css_isp_param_types.h | 15 ---
.../media/atomisp/pci/atomisp2/css2400/sh_css.c| 9 ++---
.../atomisp/pci/atomisp2/css2400/sh_css_legacy.h | 5 ---
.../atomisp/pci/atomisp2/css2400/sh_css_metrics.h | 12 --
10 files changed, 12 insertions(+), 94 deletions(-)
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe.h
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe.h
index a68eac6de36a..3f3c85c2f360 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe.h
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe.h
@@ -167,7 +167,6 @@ struct ia_css_pipe {
#define IA_CSS_DEFAULT_PIPE ( \
(struct ia_css_pipe) { \
.config = DEFAULT_PIPE_CONFIG, \
- .extra_config = DEFAULT_PIPE_EXTRA_CONFIG, \
.info = DEFAULT_PIPE_INFO, \
.mode = IA_CSS_PIPE_ID_ACC, /* (pipe_id) */ \
.pipeline = DEFAULT_PIPELINE, \
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_types.h
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_types.h
index e9ab800ae128..914049b56bc7 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_types.h
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_types.h
@@ -408,7 +408,6 @@ struct ia_css_grid_info {
/* defaults for ia_css_grid_info structs */
#define DEFAULT_GRID_INFO ( \
(struct ia_css_grid_info) { \
- .s3a_grid = DEFAULT_3A_GRID_INFO, \
.dvs_grid = DEFAULT_DVS_GRID_INFO, \
.vamem_type = IA_CSS_VAMEM_TYPE_1 \
} \
diff --git
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h
index 4b8bdc973d4b..63e70669f085 100644
---
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h
+++
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h
@@ -98,12 +98,6 @@ struct ia_css_3a_grid_info {
};
-#define DEFAULT_3A_GRID_INFO ( \
- (struct ia_css_3a_grid_info) { \
- } \
-)
-
-
/* This struct should be split into 3, for AE, AWB and AF.
* However, that will require driver/ 3A lib modifications.
*/
diff --git
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/common/ia_css_sdis_common_types.h
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/common/ia_css_sdis_common_types.h
index b9adc2af7603..f74941d49e8b 100644
---
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/common/ia_css_sdis_common_types.h
+++
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/common/ia_css_sdis_common_types.h
@@ -41,12 +41,6 @@ struct ia_css_sdis_info {
uint32_t deci_factor_log2;
};
-#define IA_CSS_DEFAULT_SDIS_INFO ( \
- (struct ia_css_sdis_info) { \
- } \
-)
-
-
/* DVS statistics grid
*
* ISP block: SDVS1 (DIS/DVS Support for DIS/DVS ver.1 (2-axes))
@@ -201,41 +195,15 @@ struct ia_css_dvs_stat_grid_info {
/* DVS statistics generated by accelerator default grid info
*/
-#define DEFAULT_DVS_STAT_PUBLIC_DVS_GLOBAL_CFG ( \
- (struct dvs_stat_public_dvs_global_cfg) { \
- } \
-)
-
-#define DEFAULT_DVS_STAT_PUBLIC_DVS_GRD_CFG ( \
- (struct dvs_stat_public_dvs_grd_cfg) { \
- } \
-)
-
-#define DEFAULT_DVS_STAT_PUBLIC_DVS_LEVEL_FE_ROI_CFG(X_START) ( \
- (struct dvs_stat_public_dvs_level_fe_roi_cfg) { \
- .x_start = X_START, \
- } \
-)
-
-#define DEFAULT_DVS_STAT_GRID_INFO ( \
- (struct ia_css_dvs_stat_grid_info) { \
- .dvs_gbl_cfg = DEFAULT_DVS_STAT_PUBLIC_DVS_GLOBAL_CFG, \
- .grd_cfg = { \
- DEFAULT_DVS_STAT_PUBLIC_DVS_GRD_CFG, \
- DEFAULT_DVS_STAT_PUBLIC_DVS_GRD_CFG, \
- DEFAULT_DVS_STAT_PUBLIC_DVS_GRD_CFG \
- }, \
- .fe_roi_cfg = { \
- DEFAULT_DVS_STAT_PUBLIC_DVS_LEVEL_FE_ROI_CFG(0), \
- DEFAULT_DVS_STAT_PUBLIC_DVS_LEVEL_FE_ROI_CFG(4), \
- DEFAULT_DVS_STAT_PUBLIC_DVS_LEVEL_FE_ROI
[PATCH v3 1/3] media: atomisp: convert default struct values to use compound-literals with designated initializers.
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 <jer...@azazel.net>
---
.../hive_isp_css_common/input_formatter_global.h | 31 ++--
.../pci/atomisp2/css2400/ia_css_frame_public.h | 56 ---
.../atomisp/pci/atomisp2/css2400/ia_css_pipe.h | 173 +++--
.../pci/atomisp2/css2400/ia_css_pipe_public.h | 159 +--
.../atomisp/pci/atomisp2/css2400/ia_css_types.h| 98 ++--
.../isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h | 149 +-
.../kernels/sdis/common/ia_css_sdis_common_types.h | 96 +---
.../isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c | 3 +-
.../runtime/binary/interface/ia_css_binary.h | 155 +-
.../atomisp2/css2400/runtime/binary/src/binary.c | 3 +-
.../isp_param/interface/ia_css_isp_param_types.h | 32 ++--
.../runtime/pipeline/interface/ia_css_pipeline.h | 35 +++--
.../css2400/runtime/pipeline/src/pipeline.c| 7 +-
.../media/atomisp/pci/atomisp2/css2400/sh_css.c| 22 +--
.../atomisp/pci/atomisp2/css2400/sh_css_legacy.h | 21 +--
.../atomisp/pci/atomisp2/css2400/sh_css_metrics.h | 36 ++---
16 files changed, 613 insertions(+), 463 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..5e19b5bd56e6 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
@@ -107,21 +107,22 @@ struct input_formatter_cfg_s {
uint32_tblock_no_reqs;
};
-#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 */\
-}
+#define DEFAULT_IF_CONFIG ( \
+ (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];
extern const hrt_data HIVE_IF_SRST_MASK[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..d0408884c524 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
@@ -120,17 +120,22 @@ struct ia_css_frame_info {
struct ia_css_crop_info crop_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 */ \
-}
+#define IA_CSS_BINARY_DEFAULT_FRAME_INFO ( \
+ (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
[PATCH v3 2/3] media: atomisp: delete zero-valued struct members.
A lot of the members of the default struct values used by the CSS API
were explicitly initialized to zero values. Designated initializers
have allowed these members to be removed.
Signed-off-by: Jeremy Sowden <jer...@azazel.net>
---
.../hive_isp_css_common/input_formatter_global.h | 17
.../pci/atomisp2/css2400/ia_css_frame_public.h | 17
.../atomisp/pci/atomisp2/css2400/ia_css_pipe.h | 44 +---
.../pci/atomisp2/css2400/ia_css_pipe_public.h | 81 ---
.../atomisp/pci/atomisp2/css2400/ia_css_types.h| 48 +
.../isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h | 111 -
.../kernels/sdis/common/ia_css_sdis_common_types.h | 34 ---
.../runtime/binary/interface/ia_css_binary.h | 89 ++---
.../isp_param/interface/ia_css_isp_param_types.h | 9 --
.../runtime/pipeline/interface/ia_css_pipeline.h | 6 --
.../atomisp/pci/atomisp2/css2400/sh_css_legacy.h | 7 --
.../atomisp/pci/atomisp2/css2400/sh_css_metrics.h | 7 --
12 files changed, 20 insertions(+), 450 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 5e19b5bd56e6..7558f4964313 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
@@ -107,23 +107,6 @@ struct input_formatter_cfg_s {
uint32_tblock_no_reqs;
};
-#define DEFAULT_IF_CONFIG ( \
- (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];
extern const hrt_data HIVE_IF_SRST_MASK[N_INPUT_FORMATTER_ID];
extern const uint8_t HIVE_IF_SWITCH_CODE[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 d0408884c524..972863fcaf9e 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
@@ -122,18 +122,8 @@ struct ia_css_frame_info {
#define IA_CSS_BINARY_DEFAULT_FRAME_INFO ( \
(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 \
- }, \
} \
)
@@ -197,16 +187,9 @@ struct ia_css_frame {
#define DEFAULT_FRAME ( \
(struct ia_css_frame) { \
.info = IA_CSS_BINARY_DEFAULT_FRAME_INFO, \
- .data = 0, \
- .data_bytes = 0, \
.dynamic_queue_id = SH_CSS_INVALID_QUEUE_ID, \
.buf_type = IA_CSS_BUFFER_TYPE_INVALID, \
.flash_state= IA_CSS_FRAME_FLASH_STATE_NONE, \
- .exp_id = 0, \
- .isp_config_id = 0, \
- .valid = false, \
- .contiguous = false, \
- .planes = { 0 } \
} \
)
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe.h
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe.h
index bfebfd8d6e63..a68eac6de36a 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe.h
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe.h
@@ -39,16 +39,11 @@ struct ia_css_preview_settings {
struct ia_css_pipe *acc_pipe;
};
-#define IA_CSS_DEFAULT_PREVIEW_SETTINGS ( \
+#
[PATCH v3 0/3] media: atomisp: clean up of data-structure initialization in the CSS API
v3. Rebased on to git://linuxtv.org/media_tree.git. Patch-set applies cleanly to linux-next as of 20171201. v2. Fixed a couple of bugs and addressed checkpatch errors. v1. 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 made it possible 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. The designated initializers also allow the removal of lots of struct-members initialized to zero values. I made the changes in three stages: firstly, I converted the default values to compound-literals and designated initializers and removed the temporary variables; secondly, I removed the zero-valued struct-members; finally, I removed some structs which had become empty. Jeremy Sowden (3): media: atomisp: convert default struct values to use compound-literals with designated initializers. media: atomisp: delete zero-valued struct members. media: atomisp: delete empty default struct values. .../hive_isp_css_common/input_formatter_global.h | 16 --- .../pci/atomisp2/css2400/ia_css_frame_public.h | 39 +++--- .../atomisp/pci/atomisp2/css2400/ia_css_pipe.h | 138 - .../pci/atomisp2/css2400/ia_css_pipe_public.h | 118 +++--- .../atomisp/pci/atomisp2/css2400/ia_css_types.h| 79 .../isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h | 50 +--- .../kernels/sdis/common/ia_css_sdis_common_types.h | 34 ++--- .../isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c | 3 +- .../runtime/binary/interface/ia_css_binary.h | 93 ++ .../atomisp2/css2400/runtime/binary/src/binary.c | 3 +- .../isp_param/interface/ia_css_isp_param_types.h | 10 -- .../runtime/pipeline/interface/ia_css_pipeline.h | 29 ++--- .../css2400/runtime/pipeline/src/pipeline.c| 7 +- .../media/atomisp/pci/atomisp2/css2400/sh_css.c| 31 ++--- .../atomisp/pci/atomisp2/css2400/sh_css_legacy.h | 11 -- .../atomisp/pci/atomisp2/css2400/sh_css_metrics.h | 21 16 files changed, 160 insertions(+), 522 deletions(-) base-commit: 781b045baefdabf7e0bc9f33672ca830d3db9f27 -- 2.15.0
[PATCH v2 2/3] media: atomisp: delete zero-valued struct members.
A lot of the members of the default struct values used by the CSS API
were explicitly initialized to zero values. Designated initializers
have allowed these members to be removed.
Signed-off-by: Jeremy Sowden <jer...@azazel.net>
---
.../hive_isp_css_common/input_formatter_global.h | 17
.../pci/atomisp2/css2400/ia_css_frame_public.h | 17
.../atomisp/pci/atomisp2/css2400/ia_css_pipe.h | 44 +---
.../pci/atomisp2/css2400/ia_css_pipe_public.h | 81 ---
.../atomisp/pci/atomisp2/css2400/ia_css_types.h| 48 +
.../isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h | 111 -
.../kernels/sdis/common/ia_css_sdis_common_types.h | 35 ---
.../runtime/binary/interface/ia_css_binary.h | 89 ++---
.../isp_param/interface/ia_css_isp_param_types.h | 9 --
.../runtime/pipeline/interface/ia_css_pipeline.h | 6 --
.../atomisp/pci/atomisp2/css2400/sh_css_legacy.h | 7 --
.../atomisp/pci/atomisp2/css2400/sh_css_metrics.h | 7 --
12 files changed, 20 insertions(+), 451 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 5e19b5bd56e6..7558f4964313 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
@@ -107,23 +107,6 @@ struct input_formatter_cfg_s {
uint32_tblock_no_reqs;
};
-#define DEFAULT_IF_CONFIG ( \
- (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];
extern const hrt_data HIVE_IF_SRST_MASK[N_INPUT_FORMATTER_ID];
extern const uint8_t HIVE_IF_SWITCH_CODE[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 56527feeb558..980b36171ca7 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
@@ -122,18 +122,8 @@ struct ia_css_frame_info {
#define IA_CSS_BINARY_DEFAULT_FRAME_INFO ( \
(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 \
- }, \
} \
)
@@ -197,16 +187,9 @@ struct ia_css_frame {
#define DEFAULT_FRAME ( \
(struct ia_css_frame) { \
.info = IA_CSS_BINARY_DEFAULT_FRAME_INFO, \
- .data = 0, \
- .data_bytes = 0, \
.dynamic_queue_id = SH_CSS_INVALID_QUEUE_ID, \
.buf_type = IA_CSS_BUFFER_TYPE_INVALID, \
.flash_state= IA_CSS_FRAME_FLASH_STATE_NONE, \
- .exp_id = 0, \
- .isp_config_id = 0, \
- .valid = false, \
- .contiguous = false, \
- .planes = { 0 } \
} \
)
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe.h
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe.h
index bfebfd8d6e63..a68eac6de36a 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe.h
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe.h
@@ -39,16 +39,11 @@ struct ia_css_preview_settings {
struct ia_css_pipe *acc_pipe;
};
-#define IA_CSS_DEFAULT_PREVIEW_SETTINGS ( \
+#
[PATCH v2 1/3] media: atomisp: convert default struct values to use compound-literals with designated initializers.
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 <jer...@azazel.net>
---
.../hive_isp_css_common/input_formatter_global.h | 31 ++--
.../pci/atomisp2/css2400/ia_css_frame_public.h | 56 ---
.../atomisp/pci/atomisp2/css2400/ia_css_pipe.h | 173 +++--
.../pci/atomisp2/css2400/ia_css_pipe_public.h | 159 +--
.../atomisp/pci/atomisp2/css2400/ia_css_types.h| 98 ++--
.../isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h | 149 +-
.../kernels/sdis/common/ia_css_sdis_common_types.h | 96 +---
.../isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c | 3 +-
.../runtime/binary/interface/ia_css_binary.h | 155 +-
.../atomisp2/css2400/runtime/binary/src/binary.c | 3 +-
.../isp_param/interface/ia_css_isp_param_types.h | 32 ++--
.../runtime/pipeline/interface/ia_css_pipeline.h | 35 +++--
.../css2400/runtime/pipeline/src/pipeline.c| 7 +-
.../media/atomisp/pci/atomisp2/css2400/sh_css.c| 22 +--
.../atomisp/pci/atomisp2/css2400/sh_css_legacy.h | 21 +--
.../atomisp/pci/atomisp2/css2400/sh_css_metrics.h | 36 ++---
16 files changed, 613 insertions(+), 463 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..5e19b5bd56e6 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
@@ -107,21 +107,22 @@ struct input_formatter_cfg_s {
uint32_tblock_no_reqs;
};
-#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 */\
-}
+#define DEFAULT_IF_CONFIG ( \
+ (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];
extern const hrt_data HIVE_IF_SRST_MASK[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 92f2389176b2..56527feeb558 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
@@ -120,17 +120,22 @@ struct ia_css_frame_info {
struct ia_css_crop_info crop_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 */ \
-}
+#define IA_CSS_BINARY_DEFAULT_FRAME_INFO ( \
+ (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
[PATCH v2 3/3] media: atomisp: delete empty default struct values.
Removing zero-valued struct-members left a number of the default
struct-values empty. These values have now been removed.
Signed-off-by: Jeremy Sowden <jer...@azazel.net>
---
.../atomisp/pci/atomisp2/css2400/ia_css_pipe.h | 1 -
.../atomisp/pci/atomisp2/css2400/ia_css_types.h| 1 -
.../isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h | 6 ---
.../kernels/sdis/common/ia_css_sdis_common_types.h | 45 --
.../isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c | 2 +-
.../runtime/binary/interface/ia_css_binary.h | 9 -
.../isp_param/interface/ia_css_isp_param_types.h | 15
.../media/atomisp/pci/atomisp2/css2400/sh_css.c| 9 ++---
.../atomisp/pci/atomisp2/css2400/sh_css_legacy.h | 5 ---
.../atomisp/pci/atomisp2/css2400/sh_css_metrics.h | 12 --
10 files changed, 12 insertions(+), 93 deletions(-)
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe.h
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe.h
index a68eac6de36a..3f3c85c2f360 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe.h
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe.h
@@ -167,7 +167,6 @@ struct ia_css_pipe {
#define IA_CSS_DEFAULT_PIPE ( \
(struct ia_css_pipe) { \
.config = DEFAULT_PIPE_CONFIG, \
- .extra_config = DEFAULT_PIPE_EXTRA_CONFIG, \
.info = DEFAULT_PIPE_INFO, \
.mode = IA_CSS_PIPE_ID_ACC, /* (pipe_id) */ \
.pipeline = DEFAULT_PIPELINE, \
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_types.h
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_types.h
index afde2d10ad70..4a77c61a9fdb 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_types.h
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_types.h
@@ -408,7 +408,6 @@ struct ia_css_grid_info {
/** defaults for ia_css_grid_info structs */
#define DEFAULT_GRID_INFO ( \
(struct ia_css_grid_info) { \
- .s3a_grid = DEFAULT_3A_GRID_INFO, \
.dvs_grid = DEFAULT_DVS_GRID_INFO, \
.vamem_type = IA_CSS_VAMEM_TYPE_1 \
} \
diff --git
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h
index e62410cdb282..4297c3addcb2 100644
---
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h
+++
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h
@@ -98,12 +98,6 @@ struct ia_css_3a_grid_info {
};
-#define DEFAULT_3A_GRID_INFO ( \
- (struct ia_css_3a_grid_info) { \
- } \
-)
-
-
/* This struct should be split into 3, for AE, AWB and AF.
* However, that will require driver/ 3A lib modifications.
*/
diff --git
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/common/ia_css_sdis_common_types.h
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/common/ia_css_sdis_common_types.h
index 4319e0191f6d..2eca83d88c14 100644
---
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/common/ia_css_sdis_common_types.h
+++
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/common/ia_css_sdis_common_types.h
@@ -41,11 +41,6 @@ struct ia_css_sdis_info {
uint32_t deci_factor_log2;
};
-#define IA_CSS_DEFAULT_SDIS_INFO ( \
- (struct ia_css_sdis_info) { \
- } \
-)
-
/** DVS statistics grid
*
* ISP block: SDVS1 (DIS/DVS Support for DIS/DVS ver.1 (2-axes))
@@ -200,41 +195,15 @@ struct ia_css_dvs_stat_grid_info {
/** DVS statistics generated by accelerator default grid info
*/
-#define DEFAULT_DVS_STAT_PUBLIC_DVS_GLOBAL_CFG ( \
- (struct dvs_stat_public_dvs_global_cfg) { \
- } \
-)
-
-#define DEFAULT_DVS_STAT_PUBLIC_DVS_GRD_CFG ( \
- (struct dvs_stat_public_dvs_grd_cfg) { \
- } \
-)
-
-#define DEFAULT_DVS_STAT_PUBLIC_DVS_LEVEL_FE_ROI_CFG(X_START) ( \
- (struct dvs_stat_public_dvs_level_fe_roi_cfg) { \
- .x_start = X_START, \
- } \
-)
-
-#define DEFAULT_DVS_STAT_GRID_INFO ( \
- (struct ia_css_dvs_stat_grid_info) { \
- .dvs_gbl_cfg = DEFAULT_DVS_STAT_PUBLIC_DVS_GLOBAL_CFG, \
- .grd_cfg = { \
- DEFAULT_DVS_STAT_PUBLIC_DVS_GRD_CFG, \
- DEFAULT_DVS_STAT_PUBLIC_DVS_GRD_CFG, \
- DEFAULT_DVS_STAT_PUBLIC_DVS_GRD_CFG \
- }, \
- .fe_roi_cfg = { \
- DEFAULT_DVS_STAT_PUBLIC_DVS_LEVEL_FE_ROI_CFG(0), \
- DEFAULT_DVS_STAT_PUBLIC_DVS_LEVEL_FE_ROI_CFG(4), \
- DEFAULT_DVS_STAT_PUBLIC_DVS_LEVEL_FE_ROI
[PATCH v2 0/3] media: atomisp: clean up of data-structure initialization in the CSS API
v2. Fixed a couple of bugs and addressed checkpatch errors. v1. 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 made it possible 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. The designated initializers also allow the removal of lots of struct-members initialized to zero values. I made the changes in three stages: firstly, I converted the default values to compound-literals and designated initializers and removed the temporary variables; secondly, I removed the zero-valued struct-members; finally, I removed some structs which had become empty. Jeremy Sowden (3): media: atomisp: convert default struct values to use compound-literals with designated initializers. media: atomisp: delete zero-valued struct members. media: atomisp: delete empty default struct values. .../hive_isp_css_common/input_formatter_global.h | 16 --- .../pci/atomisp2/css2400/ia_css_frame_public.h | 39 +++--- .../atomisp/pci/atomisp2/css2400/ia_css_pipe.h | 138 - .../pci/atomisp2/css2400/ia_css_pipe_public.h | 118 +++--- .../atomisp/pci/atomisp2/css2400/ia_css_types.h| 79 .../isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h | 50 +--- .../kernels/sdis/common/ia_css_sdis_common_types.h | 34 ++--- .../isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c | 3 +- .../runtime/binary/interface/ia_css_binary.h | 93 ++ .../atomisp2/css2400/runtime/binary/src/binary.c | 3 +- .../isp_param/interface/ia_css_isp_param_types.h | 10 -- .../runtime/pipeline/interface/ia_css_pipeline.h | 29 ++--- .../css2400/runtime/pipeline/src/pipeline.c| 7 +- .../media/atomisp/pci/atomisp2/css2400/sh_css.c| 31 ++--- .../atomisp/pci/atomisp2/css2400/sh_css_legacy.h | 11 -- .../atomisp/pci/atomisp2/css2400/sh_css_metrics.h | 21 16 files changed, 160 insertions(+), 522 deletions(-) base-commit: 37cb8e1f8e10c6e9bd2a1b95cdda0620a21b0551 -- 2.15.0
Re: [PATCH 1/3] media: atomisp: convert default struct values to use compound-literals with designated initializers.
On 2017-12-01, at 18:07:25 +0300, Dan Carpenter wrote:
> I can't apply this (to today's linux-next) but does this really work:
>
> > +(struct ia_css_3a_grid_info) { \
> > + .ae_enable = 0, \
> > + .ae_grd_info= (struct ae_public_config_grid_config) { \
> > + width = 0, \
> > + height = 0, \
> > + b_width = 0, \
> > + b_height = 0, \
> > + x_start = 0, \
> > + y_start = 0, \
> > + x_end = 0, \
> > + y_end = 0 \
>
> I'm pretty sure those lines should start with a period.
>
> - width = 0, \
> + .width = 0, \
Indeed they should. A second version is in the pipeline.
J.
signature.asc
Description: PGP signature
[PATCH 1/3] media: atomisp: convert default struct values to use compound-literals with designated initializers.
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 <jer...@azazel.net>
---
.../hive_isp_css_common/input_formatter_global.h | 25 ++--
.../pci/atomisp2/css2400/ia_css_frame_public.h | 46 ---
.../atomisp/pci/atomisp2/css2400/ia_css_pipe.h | 145 +++--
.../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 | 130 +-
.../kernels/sdis/common/ia_css_sdis_common_types.h | 85 +---
.../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, 514 insertions(+), 397 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..d5a586b08955 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,20 @@ struct input_formatter_cfg_s {
};
#define DEFAULT_IF_CONFIG \
+(struct input_formatter_cfg_s) \
{ \
- 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 */\
+ .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 92f2389176b2..786585037af9 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_FRAM
[PATCH 0/3] Clean up of data-structure initialization in the CSS API
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 made it possible 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. The designated initializers also allow the removal of lots of struct-members initialized to zero values. I made the changes in three stages: firstly, I converted the default values to compound-literals and designated initializers and removed the temporary variables; secondly, I removed the zero-valued struct-members; finally, I removed some structs which had become empty. Jeremy Sowden (3): media: atomisp: convert default struct values to use compound-literals with designated initializers. media: atomisp: delete zero-valued struct members. media: atomisp: delete empty default struct values. .../hive_isp_css_common/input_formatter_global.h | 16 --- .../pci/atomisp2/css2400/ia_css_frame_public.h | 29 ++ .../atomisp/pci/atomisp2/css2400/ia_css_pipe.h | 110 +++-- .../pci/atomisp2/css2400/ia_css_pipe_public.h | 108 +++- .../atomisp/pci/atomisp2/css2400/ia_css_types.h| 64 +++- .../isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h | 50 +- .../kernels/sdis/common/ia_css_sdis_common_types.h | 31 ++ .../isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c | 3 +- .../runtime/binary/interface/ia_css_binary.h | 88 ++--- .../atomisp2/css2400/runtime/binary/src/binary.c | 3 +- .../isp_param/interface/ia_css_isp_param_types.h | 10 -- .../runtime/pipeline/interface/ia_css_pipeline.h | 24 ++--- .../css2400/runtime/pipeline/src/pipeline.c| 7 +- .../media/atomisp/pci/atomisp2/css2400/sh_css.c| 31 ++ .../atomisp/pci/atomisp2/css2400/sh_css_legacy.h | 11 --- .../atomisp/pci/atomisp2/css2400/sh_css_metrics.h | 21 16 files changed, 114 insertions(+), 492 deletions(-) base-commit: 37cb8e1f8e10c6e9bd2a1b95cdda0620a21b0551 -- 2.15.0
[PATCH 3/3] media: atomisp: delete empty default struct values.
Removing zero-valued struct-members left a number of the default
struct-values empty. These values have now been removed.
Signed-off-by: Jeremy Sowden <jer...@azazel.net>
---
.../atomisp/pci/atomisp2/css2400/ia_css_pipe.h | 1 -
.../atomisp/pci/atomisp2/css2400/ia_css_types.h| 1 -
.../isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h | 3 --
.../kernels/sdis/common/ia_css_sdis_common_types.h | 34 +-
.../isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c | 2 +-
.../runtime/binary/interface/ia_css_binary.h | 6
.../isp_param/interface/ia_css_isp_param_types.h | 9 --
.../media/atomisp/pci/atomisp2/css2400/sh_css.c| 9 +++---
.../atomisp/pci/atomisp2/css2400/sh_css_legacy.h | 2 --
.../atomisp/pci/atomisp2/css2400/sh_css_metrics.h | 8 -
10 files changed, 12 insertions(+), 63 deletions(-)
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe.h
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe.h
index a8f89866876d..9c6efaa66c93 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe.h
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe.h
@@ -164,7 +164,6 @@ struct ia_css_pipe {
#define IA_CSS_DEFAULT_PIPE \
(struct ia_css_pipe) { \
.config = DEFAULT_PIPE_CONFIG, \
- .extra_config = DEFAULT_PIPE_EXTRA_CONFIG, \
.info = DEFAULT_PIPE_INFO, \
.mode = IA_CSS_PIPE_ID_ACC, /* (pipe_id) */ \
.pipeline = DEFAULT_PIPELINE, \
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_types.h
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_types.h
index 0ae60a3d0643..e49fe5bc98b8 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_types.h
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_types.h
@@ -407,7 +407,6 @@ struct ia_css_grid_info {
/** defaults for ia_css_grid_info structs */
#define DEFAULT_GRID_INFO \
(struct ia_css_grid_info) { \
- .s3a_grid = DEFAULT_3A_GRID_INFO, \
.dvs_grid = DEFAULT_DVS_GRID_INFO, \
.vamem_type = IA_CSS_VAMEM_TYPE_1 \
}
diff --git
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h
index 1309b06747d0..4297c3addcb2 100644
---
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h
+++
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h
@@ -98,9 +98,6 @@ struct ia_css_3a_grid_info {
};
-#define DEFAULT_3A_GRID_INFO (struct ia_css_3a_grid_info) { }
-
-
/* This struct should be split into 3, for AE, AWB and AF.
* However, that will require driver/ 3A lib modifications.
*/
diff --git
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/common/ia_css_sdis_common_types.h
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/common/ia_css_sdis_common_types.h
index a969384430aa..4cfd31bd3e5f 100644
---
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/common/ia_css_sdis_common_types.h
+++
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/common/ia_css_sdis_common_types.h
@@ -41,8 +41,6 @@ struct ia_css_sdis_info {
uint32_t deci_factor_log2;
};
-#define IA_CSS_DEFAULT_SDIS_INFO (struct ia_css_sdis_info) { }
-
/** DVS statistics grid
*
* ISP block: SDVS1 (DIS/DVS Support for DIS/DVS ver.1 (2-axes))
@@ -197,33 +195,15 @@ struct ia_css_dvs_stat_grid_info {
/** DVS statistics generated by accelerator default grid info
*/
-#define DEFAULT_DVS_STAT_PUBLIC_DVS_GLOBAL_CFG \
-(struct dvs_stat_public_dvs_global_cfg) { }
-
-#define DEFAULT_DVS_STAT_PUBLIC_DVS_GRD_CFG \
-(struct dvs_stat_public_dvs_grd_cfg) { }
-
-#define DEFAULT_DVS_STAT_PUBLIC_DVS_LEVEL_FE_ROI_CFG(X_START) \
- (struct dvs_stat_public_dvs_level_fe_roi_cfg) { .x_start = X_START, }
-
-#define DEFAULT_DVS_STAT_GRID_INFO \
-(struct ia_css_dvs_stat_grid_info) { \
- .dvs_gbl_cfg = DEFAULT_DVS_STAT_PUBLIC_DVS_GLOBAL_CFG, \
- .grd_cfg = { \
- DEFAULT_DVS_STAT_PUBLIC_DVS_GRD_CFG, \
- DEFAULT_DVS_STAT_PUBLIC_DVS_GRD_CFG, \
- DEFAULT_DVS_STAT_PUBLIC_DVS_GRD_CFG \
- }, \
- .fe_roi_cfg = { \
- DEFAULT_DVS_STAT_PUBLIC_DVS_LEVEL_FE_ROI_CFG(0), \
- DEFAULT_DVS_STAT_PUBLIC_DVS_LEVEL_FE_ROI_CFG(4), \
- DEFAULT_DVS_STAT_PUBLIC_DVS_LEVEL_FE_ROI_CFG(0), \
- } \
-}
-
#define DEFAULT_DVS_GRID_INFO \
(union ia_css_dvs_grid_u) { \
- .dvs_stat_grid_info = DEFAULT_DVS_STAT_GRID_INFO, \
+ .dvs_stat_grid_info = (struct ia_css_dvs_stat_grid_info) { \
+ .fe_roi_cfg = { \
+ [1] = (struct dvs_stat_public_dvs_level_fe_r
[PATCH 2/3] media: atomisp: delete zero-valued struct members.
A lot of the members of the default struct values used by the CSS API
were explicitly initialized to zero values. Designated initializers
have allowed these members to be removed.
Signed-off-by: Jeremy Sowden <jer...@azazel.net>
---
.../hive_isp_css_common/input_formatter_global.h | 17
.../pci/atomisp2/css2400/ia_css_frame_public.h | 17
.../atomisp/pci/atomisp2/css2400/ia_css_pipe.h | 42 +---
.../pci/atomisp2/css2400/ia_css_pipe_public.h | 82 ---
.../atomisp/pci/atomisp2/css2400/ia_css_types.h| 47 +
.../isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h | 113 +
.../kernels/sdis/common/ia_css_sdis_common_types.h | 48 +
.../runtime/binary/interface/ia_css_binary.h | 90 ++--
.../isp_param/interface/ia_css_isp_param_types.h | 18 +---
.../runtime/pipeline/interface/ia_css_pipeline.h | 6 --
.../atomisp/pci/atomisp2/css2400/sh_css_legacy.h | 11 +-
.../atomisp/pci/atomisp2/css2400/sh_css_metrics.h | 11 +-
12 files changed, 29 insertions(+), 473 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 d5a586b08955..7558f4964313 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
@@ -107,23 +107,6 @@ struct input_formatter_cfg_s {
uint32_tblock_no_reqs;
};
-#define DEFAULT_IF_CONFIG \
-(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];
extern const hrt_data HIVE_IF_SRST_MASK[N_INPUT_FORMATTER_ID];
extern const uint8_t HIVE_IF_SWITCH_CODE[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 786585037af9..b0872f93b3fa 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
@@ -122,18 +122,8 @@ struct ia_css_frame_info {
#define IA_CSS_BINARY_DEFAULT_FRAME_INFO \
(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 \
- }, \
}
/**
@@ -196,16 +186,9 @@ struct ia_css_frame {
#define DEFAULT_FRAME \
(struct ia_css_frame) { \
.info = IA_CSS_BINARY_DEFAULT_FRAME_INFO, \
- .data = 0, \
- .data_bytes = 0, \
.dynamic_queue_id = SH_CSS_INVALID_QUEUE_ID, \
.buf_type = IA_CSS_BUFFER_TYPE_INVALID, \
.flash_state= IA_CSS_FRAME_FLASH_STATE_NONE, \
- .exp_id = 0, \
- .isp_config_id = 0, \
- .valid = false, \
- .contiguous = false, \
- .planes = { 0 } \
}
/** @brief Fill a frame with zeros
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe.h
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe.h
index 5d307679768e..a8f89866876d 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe.h
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe.h
@@ -44,11 +44,6 @@ struct ia_css_preview_settings {
.copy_binary= IA_CSS_BINARY_DEFAULT_SETTINGS, \
.preview_binary = IA_CSS_BINARY_DEFAULT_SETTINGS, \
.vf_pp_binary = IA_CSS_BINARY_DEFAULT_SETTINGS, \
- .delay_frames = { NULL }, \
- .tnr_frames = { NULL }, \
- .copy_pipe = NULL, \
- .capture_pipe = NULL, \
- .acc_pipe = NULL, \
}
struct ia_css_capture_settings {
@@
Re: [PATCH v2 1/3] media: staging: atomisp: fix for sparse "using plain integer as NULL pointer" warnings.
On 2017-11-29, at 03:04:53 +0300, Dan Carpenter wrote:
> On Tue, Nov 28, 2017 at 11:33:37PM +0000, Jeremy Sowden wrote:
> > On 2017-11-28, at 17:15:24 +0300, Dan Carpenter wrote:
> > > On Mon, Nov 27, 2017 at 12:44:48PM +0000, Jeremy Sowden wrote:
> > > > The "address" member of struct ia_css_host_data is a
> > > > pointer-to-char, so define default as NULL.
> > > >
> > > > ---
> > > > a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isp_param/interface/ia_css_isp_param_types.h
> > > > +++
> > > > b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isp_param/interface/ia_css_isp_param_types.h
> > > > @@ -95,7 +95,7 @@ union ia_css_all_memory_offsets {
> > > > };
> > > >
> > > > #define IA_CSS_DEFAULT_ISP_MEM_PARAMS \
> > > > - { { { { 0, 0 } } } }
> > > > + { { { { NULL, 0 } } } }
> > >
> > > This define is way ugly and instead of making superficial changes, you
> > > should try to eliminate it.
> > >
> > > People look at warnings as a bad thing but they are actually a
> > > valuable resource which call attention to bad code. By making this
> > > change you're kind of wasting the warning. The bad code is still
> > > there, it's just swept under the rug but like a dead mouse carcass
> > > it's still stinking up the living room. We should leave the warning
> > > there until it irritates someone enough to fix it properly.
> >
> > Tracking down the offending initializer was definitely a pain.
> >
> > Compound literals with designated initializers would make this macro
> > (and a number of others) easier to understand and more type-safe:
> >
> >#define IA_CSS_DEFAULT_ISP_MEM_PARAMS \
> > - { { { { 0, 0 } } } }
> > + (struct ia_css_isp_param_host_segments) { \
> > + .params = { { \
> > + (struct ia_css_host_data) { \
> > + .address = NULL, \
> > + .size = 0 \
> > + } \
> > + } } \
> > + }
>
> Using designated initializers is good, yes. Can't we just use an
> empty initializer since this is all zeroed memory anyway?
>
> (struct ia_css_isp_param_host_segments) { }
>
> I haven't tried it.
There are 35 defaults defined by macros like this, most of them much
more complicated that IA_CSS_DEFAULT_ISP_MEM_PARAMS, and a few members
are initialized to non-zero values. My plan, therefore, is to convert
everything to use designated initializers, and then start removing the
zeroes afterwards.
> >
> > Unfortunately this default value is one end of a chain of default values
>
> Yeah. A really long chain...
>
> > used to initialize members of default values of enclosing structs where
> > the outermost values are used to initialize some static variables:
> >
> > static enum ia_css_err
> > init_pipe_defaults(enum ia_css_pipe_mode mode,
> > struct ia_css_pipe *pipe,
> > bool copy_pipe)
> > {
> > static struct ia_css_pipe default_pipe = IA_CSS_DEFAULT_PIPE;
> > static struct ia_css_preview_settings prev =
> > IA_CSS_DEFAULT_PREVIEW_SETTINGS;
> > static struct ia_css_capture_settings capt =
> > IA_CSS_DEFAULT_CAPTURE_SETTINGS;
> > static struct ia_css_video_settings video =
> > IA_CSS_DEFAULT_VIDEO_SETTINGS;
> > static struct ia_css_yuvpp_settings yuvpp =
> > IA_CSS_DEFAULT_YUVPP_SETTINGS;
> >
> > if (pipe == NULL) {
> > IA_CSS_ERROR("NULL pipe parameter");
> > return IA_CSS_ERR_INVALID_ARGUMENTS;
> > }
> >
> > /* Initialize pipe to pre-defined defaults */
> > *pipe = default_pipe;
> >
> > [...]
> >
> > I'm not convinced, however, that those variables actually achieve very
> > much. If I change the code to assign the defaults directly, the problem
> > goes away:
> >
> > [...]
> >
> > Does this seem reasonable or am I barking up the wrong tree?
>
> Yes. Chopping the chain down and deleting as much of this code as
> possible seems a good thing.
I'll get chopping.
J.
signature.asc
Description: PGP signature
Re: [PATCH v2 1/3] media: staging: atomisp: fix for sparse "using plain integer as NULL pointer" warnings.
On 2017-11-28, at 17:15:24 +0300, Dan Carpenter wrote:
> On Mon, Nov 27, 2017 at 12:44:48PM +0000, Jeremy Sowden wrote:
> > The "address" member of struct ia_css_host_data is a
> > pointer-to-char, so define default as NULL.
> >
> > ---
> > a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isp_param/interface/ia_css_isp_param_types.h
> > +++
> > b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isp_param/interface/ia_css_isp_param_types.h
> > @@ -95,7 +95,7 @@ union ia_css_all_memory_offsets {
> > };
> >
> > #define IA_CSS_DEFAULT_ISP_MEM_PARAMS \
> > - { { { { 0, 0 } } } }
> > + { { { { NULL, 0 } } } }
>
> This define is way ugly and instead of making superficial changes, you
> should try to eliminate it.
>
> People look at warnings as a bad thing but they are actually a
> valuable resource which call attention to bad code. By making this
> change you're kind of wasting the warning. The bad code is still
> there, it's just swept under the rug but like a dead mouse carcass
> it's still stinking up the living room. We should leave the warning
> there until it irritates someone enough to fix it properly.
Tracking down the offending initializer was definitely a pain.
Compound literals with designated initializers would make this macro
(and a number of others) easier to understand and more type-safe:
#define IA_CSS_DEFAULT_ISP_MEM_PARAMS \
- { { { { 0, 0 } } } }
+ (struct ia_css_isp_param_host_segments) { \
+ .params = { { \
+ (struct ia_css_host_data) { \
+ .address = NULL, \
+ .size = 0 \
+ } \
+ } } \
+ }
Unfortunately this default value is one end of a chain of default values
used to initialize members of default values of enclosing structs where
the outermost values are used to initialize some static variables:
static enum ia_css_err
init_pipe_defaults(enum ia_css_pipe_mode mode,
struct ia_css_pipe *pipe,
bool copy_pipe)
{
static struct ia_css_pipe default_pipe = IA_CSS_DEFAULT_PIPE;
static struct ia_css_preview_settings prev =
IA_CSS_DEFAULT_PREVIEW_SETTINGS;
static struct ia_css_capture_settings capt =
IA_CSS_DEFAULT_CAPTURE_SETTINGS;
static struct ia_css_video_settings video = IA_CSS_DEFAULT_VIDEO_SETTINGS;
static struct ia_css_yuvpp_settings yuvpp = IA_CSS_DEFAULT_YUVPP_SETTINGS;
if (pipe == NULL) {
IA_CSS_ERROR("NULL pipe parameter");
return IA_CSS_ERR_INVALID_ARGUMENTS;
}
/* Initialize pipe to pre-defined defaults */
*pipe = default_pipe;
/* TODO: JB should not be needed, but temporary backward reference */
switch (mode) {
case IA_CSS_PIPE_MODE_PREVIEW:
pipe->mode = IA_CSS_PIPE_ID_PREVIEW;
pipe->pipe_settings.preview = prev;
break;
case IA_CSS_PIPE_MODE_CAPTURE:
if (copy_pipe) {
pipe->mode = IA_CSS_PIPE_ID_COPY;
} else {
pipe->mode = IA_CSS_PIPE_ID_CAPTURE;
}
pipe->pipe_settings.capture = capt;
break;
case IA_CSS_PIPE_MODE_VIDEO:
pipe->mode = IA_CSS_PIPE_ID_VIDEO;
pipe->pipe_settings.video = video;
break;
case IA_CSS_PIPE_MODE_ACC:
pipe->mode = IA_CSS_PIPE_ID_ACC;
break;
case IA_CSS_PIPE_MODE_COPY:
pipe->mode = IA_CSS_PIPE_ID_CAPTURE;
break;
case IA_CSS_PIPE_MODE_YUVPP:
pipe->mode = IA_CSS_PIPE_ID_YUVPP;
pipe->pipe_settings.yuvpp = yuvpp;
break;
default:
return IA_CSS_ERR_INVALID_ARGUMENTS;
}
return IA_CSS_SUCCESS;
}
and GCC's limited support for using compound literals to initialize
static variables doesn't stretch this far.
I'm not convinced, however, that those variables actually achieve very
much. If I change the code to assign the defaults directly, the problem
goes away:
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c
index f92b6a9f77eb..671b2c732a46 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c
@@ -2291,25 +2291,19 @@ init_pipe_defaults(enum ia_css_pipe_mode mode,
struct ia_css_pipe *pipe,
bool copy_pipe)
{
- static struct ia_css_pipe default_pipe = IA_CSS_DEFAULT_PIPE;
- static struct ia_css_preview_settings prev =
IA_CSS_DEFAULT_PREVIEW_SETTINGS;
- static struct ia_css_capture_settings capt =
IA_CSS_DEFAULT_CAPTURE_SETTINGS;
- static struct ia_css_video_settings video =
IA_CSS_DEFAULT_VIDEO_SETTINGS;
- static struct ia_css_yuvpp_settings yuvpp =
IA_CSS_DE
[PATCH v3 1/2] media: staging: atomisp: fix for sparse "using plain integer as NULL pointer" warnings.
The "address" member of struct ia_css_host_data is a pointer-to-char, so define
default as NULL.
Signed-off-by: Jeremy Sowden <jer...@azazel.net>
---
.../css2400/runtime/isp_param/interface/ia_css_isp_param_types.h| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isp_param/interface/ia_css_isp_param_types.h
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isp_param/interface/ia_css_isp_param_types.h
index 8e651b80345a..6fee3f7fd184 100644
---
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isp_param/interface/ia_css_isp_param_types.h
+++
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isp_param/interface/ia_css_isp_param_types.h
@@ -95,7 +95,7 @@ union ia_css_all_memory_offsets {
};
#define IA_CSS_DEFAULT_ISP_MEM_PARAMS \
- { { { { 0, 0 } } } }
+ { { { { NULL, 0 } } } }
#define IA_CSS_DEFAULT_ISP_CSS_PARAMS \
{ { { { 0, 0 } } } }
--
2.15.0
[PATCH v2 0/3] Sparse fixes for the Atom ISP Staging Driver
Fixed some sparse warnings in the Atom ISP staging driver. This time with longer commit messages. :) I've chosen to ignore checkpatch.pl's suggestion to change the types of the arrays in the second patch from int16_t to s16. Jeremy Sowden (2): media: staging: atomisp: fix for sparse "using plain integer as NULL pointer" warnings. media: staging: atomisp: fixes for "symbol was not declared. Should it be static?" sparse warnings. .../isp/kernels/eed1_8/ia_css_eed1_8.host.c| 24 +++--- .../isp_param/interface/ia_css_isp_param_types.h | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) base-commit: 844056fd74ebdd826bd23a7d989597e15f478acb -- 2.15.0
[PATCH v3 2/2] media: staging: atomisp: fixes for "symbol was not declared. Should it be static?" sparse warnings.
Defined some const arrays as static since they don't need external linkage.
Signed-off-by: Jeremy Sowden <jer...@azazel.net>
---
.../isp/kernels/eed1_8/ia_css_eed1_8.host.c| 24 +++---
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8.host.c
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8.host.c
index 682f8b709ff9..47bb5042381b 100644
---
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8.host.c
+++
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8.host.c
@@ -32,44 +32,44 @@
#define NUMBER_OF_TCINV_POINTS 9
#define NUMBER_OF_FCINV_POINTS 9
-const int16_t chgrinv_x[NUMBER_OF_CHGRINV_POINTS] = {
+static const int16_t chgrinv_x[NUMBER_OF_CHGRINV_POINTS] = {
0, 16, 64, 144, 272, 448, 672, 976,
1376, 1888, 2528, 3312, 4256, 5376, 6688};
-const int16_t chgrinv_a[NUMBER_OF_CHGRINV_POINTS] = {
+static const int16_t chgrinv_a[NUMBER_OF_CHGRINV_POINTS] = {
-7171, -256, -29, -3456, -1071, -475, -189, -102,
-48, -38, -10, -9, -7, -6, 0};
-const int16_t chgrinv_b[NUMBER_OF_CHGRINV_POINTS] = {
+static const int16_t chgrinv_b[NUMBER_OF_CHGRINV_POINTS] = {
8191, 1021, 256, 114, 60, 37, 24, 17,
12, 9, 6, 5, 4, 3, 2};
-const int16_t chgrinv_c[NUMBER_OF_CHGRINV_POINTS] = {
+static const int16_t chgrinv_c[NUMBER_OF_CHGRINV_POINTS] = {
1, 1, 1, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0};
-const int16_t tcinv_x[NUMBER_OF_TCINV_POINTS] = {
+static const int16_t tcinv_x[NUMBER_OF_TCINV_POINTS] = {
0, 4, 11, 23, 42, 68, 102, 148, 205};
-const int16_t tcinv_a[NUMBER_OF_TCINV_POINTS] = {
+static const int16_t tcinv_a[NUMBER_OF_TCINV_POINTS] = {
-6364, -631, -126, -34, -13, -6, -4452, -2156, 0};
-const int16_t tcinv_b[NUMBER_OF_TCINV_POINTS] = {
+static const int16_t tcinv_b[NUMBER_OF_TCINV_POINTS] = {
8191, 1828, 726, 352, 197, 121, 80, 55, 40};
-const int16_t tcinv_c[NUMBER_OF_TCINV_POINTS] = {
+static const int16_t tcinv_c[NUMBER_OF_TCINV_POINTS] = {
1, 1, 1, 1, 1, 1, 0, 0, 0};
-const int16_t fcinv_x[NUMBER_OF_FCINV_POINTS] = {
+static const int16_t fcinv_x[NUMBER_OF_FCINV_POINTS] = {
0, 80, 216, 456, 824, 1344, 2040, 2952, 4096};
-const int16_t fcinv_a[NUMBER_OF_FCINV_POINTS] = {
+static const int16_t fcinv_a[NUMBER_OF_FCINV_POINTS] = {
-5244, -486, -86, -2849, -961, -400, -180, -86, 0};
-const int16_t fcinv_b[NUMBER_OF_FCINV_POINTS] = {
+static const int16_t fcinv_b[NUMBER_OF_FCINV_POINTS] = {
8191, 1637, 607, 287, 159, 98, 64, 44, 32};
-const int16_t fcinv_c[NUMBER_OF_FCINV_POINTS] = {
+static const int16_t fcinv_c[NUMBER_OF_FCINV_POINTS] = {
1, 1, 1, 0, 0, 0, 0, 0, 0};
--
2.15.0
Re: [PATCH v2 3/3] media: staging: atomisp: fixed some checkpatch integer type warnings.
On 2017-11-27, at 19:09:38 +, Alan Cox wrote: > On Mon, 27 Nov 2017 12:44:50 +0000 Jeremy Sowden wrote: > > Changed the types of some arrays from int16_t to s16 > > Which are the same type, except int16_t is the standard form. > > No point. Righto, so this would be one of those cases in which I should have exercised judgment: checkpatch suggested preferring the kernel's own types, but it wasn't a reason to change existing code. Thanks for the feedback. J.
[PATCH v2 2/3] media: staging: atomisp: fixes for "symbol was not declared. Should it be static?" sparse warnings.
Defined some const arrays as static since they don't need external linkage.
Signed-off-by: Jeremy Sowden <jer...@azazel.net>
---
.../isp/kernels/eed1_8/ia_css_eed1_8.host.c| 24 +++---
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8.host.c
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8.host.c
index 682f8b709ff9..47bb5042381b 100644
---
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8.host.c
+++
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8.host.c
@@ -32,44 +32,44 @@
#define NUMBER_OF_TCINV_POINTS 9
#define NUMBER_OF_FCINV_POINTS 9
-const int16_t chgrinv_x[NUMBER_OF_CHGRINV_POINTS] = {
+static const int16_t chgrinv_x[NUMBER_OF_CHGRINV_POINTS] = {
0, 16, 64, 144, 272, 448, 672, 976,
1376, 1888, 2528, 3312, 4256, 5376, 6688};
-const int16_t chgrinv_a[NUMBER_OF_CHGRINV_POINTS] = {
+static const int16_t chgrinv_a[NUMBER_OF_CHGRINV_POINTS] = {
-7171, -256, -29, -3456, -1071, -475, -189, -102,
-48, -38, -10, -9, -7, -6, 0};
-const int16_t chgrinv_b[NUMBER_OF_CHGRINV_POINTS] = {
+static const int16_t chgrinv_b[NUMBER_OF_CHGRINV_POINTS] = {
8191, 1021, 256, 114, 60, 37, 24, 17,
12, 9, 6, 5, 4, 3, 2};
-const int16_t chgrinv_c[NUMBER_OF_CHGRINV_POINTS] = {
+static const int16_t chgrinv_c[NUMBER_OF_CHGRINV_POINTS] = {
1, 1, 1, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0};
-const int16_t tcinv_x[NUMBER_OF_TCINV_POINTS] = {
+static const int16_t tcinv_x[NUMBER_OF_TCINV_POINTS] = {
0, 4, 11, 23, 42, 68, 102, 148, 205};
-const int16_t tcinv_a[NUMBER_OF_TCINV_POINTS] = {
+static const int16_t tcinv_a[NUMBER_OF_TCINV_POINTS] = {
-6364, -631, -126, -34, -13, -6, -4452, -2156, 0};
-const int16_t tcinv_b[NUMBER_OF_TCINV_POINTS] = {
+static const int16_t tcinv_b[NUMBER_OF_TCINV_POINTS] = {
8191, 1828, 726, 352, 197, 121, 80, 55, 40};
-const int16_t tcinv_c[NUMBER_OF_TCINV_POINTS] = {
+static const int16_t tcinv_c[NUMBER_OF_TCINV_POINTS] = {
1, 1, 1, 1, 1, 1, 0, 0, 0};
-const int16_t fcinv_x[NUMBER_OF_FCINV_POINTS] = {
+static const int16_t fcinv_x[NUMBER_OF_FCINV_POINTS] = {
0, 80, 216, 456, 824, 1344, 2040, 2952, 4096};
-const int16_t fcinv_a[NUMBER_OF_FCINV_POINTS] = {
+static const int16_t fcinv_a[NUMBER_OF_FCINV_POINTS] = {
-5244, -486, -86, -2849, -961, -400, -180, -86, 0};
-const int16_t fcinv_b[NUMBER_OF_FCINV_POINTS] = {
+static const int16_t fcinv_b[NUMBER_OF_FCINV_POINTS] = {
8191, 1637, 607, 287, 159, 98, 64, 44, 32};
-const int16_t fcinv_c[NUMBER_OF_FCINV_POINTS] = {
+static const int16_t fcinv_c[NUMBER_OF_FCINV_POINTS] = {
1, 1, 1, 0, 0, 0, 0, 0, 0};
--
2.15.0
[PATCH v2 1/3] media: staging: atomisp: fix for sparse "using plain integer as NULL pointer" warnings.
The "address" member of struct ia_css_host_data is a pointer-to-char, so define
default as NULL.
Signed-off-by: Jeremy Sowden <jer...@azazel.net>
---
.../css2400/runtime/isp_param/interface/ia_css_isp_param_types.h| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isp_param/interface/ia_css_isp_param_types.h
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isp_param/interface/ia_css_isp_param_types.h
index 8e651b80345a..6fee3f7fd184 100644
---
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isp_param/interface/ia_css_isp_param_types.h
+++
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isp_param/interface/ia_css_isp_param_types.h
@@ -95,7 +95,7 @@ union ia_css_all_memory_offsets {
};
#define IA_CSS_DEFAULT_ISP_MEM_PARAMS \
- { { { { 0, 0 } } } }
+ { { { { NULL, 0 } } } }
#define IA_CSS_DEFAULT_ISP_CSS_PARAMS \
{ { { { 0, 0 } } } }
--
2.15.0
[PATCH v2 3/3] media: staging: atomisp: fixed some checkpatch integer type warnings.
Changed the types of some arrays from int16_t to s16.
Signed-off-by: Jeremy Sowden <jer...@azazel.net>
---
.../isp/kernels/eed1_8/ia_css_eed1_8.host.c| 25 +++---
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8.host.c
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8.host.c
index 47bb5042381b..af6c8688876d 100644
---
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8.host.c
+++
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8.host.c
@@ -32,47 +32,46 @@
#define NUMBER_OF_TCINV_POINTS 9
#define NUMBER_OF_FCINV_POINTS 9
-static const int16_t chgrinv_x[NUMBER_OF_CHGRINV_POINTS] = {
+static const s16 chgrinv_x[NUMBER_OF_CHGRINV_POINTS] = {
0, 16, 64, 144, 272, 448, 672, 976,
1376, 1888, 2528, 3312, 4256, 5376, 6688};
-static const int16_t chgrinv_a[NUMBER_OF_CHGRINV_POINTS] = {
+static const s16 chgrinv_a[NUMBER_OF_CHGRINV_POINTS] = {
-7171, -256, -29, -3456, -1071, -475, -189, -102,
-48, -38, -10, -9, -7, -6, 0};
-static const int16_t chgrinv_b[NUMBER_OF_CHGRINV_POINTS] = {
+static const s16 chgrinv_b[NUMBER_OF_CHGRINV_POINTS] = {
8191, 1021, 256, 114, 60, 37, 24, 17,
12, 9, 6, 5, 4, 3, 2};
-static const int16_t chgrinv_c[NUMBER_OF_CHGRINV_POINTS] = {
+static const s16 chgrinv_c[NUMBER_OF_CHGRINV_POINTS] = {
1, 1, 1, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0};
-static const int16_t tcinv_x[NUMBER_OF_TCINV_POINTS] = {
+static const s16 tcinv_x[NUMBER_OF_TCINV_POINTS] = {
0, 4, 11, 23, 42, 68, 102, 148, 205};
-static const int16_t tcinv_a[NUMBER_OF_TCINV_POINTS] = {
+static const s16 tcinv_a[NUMBER_OF_TCINV_POINTS] = {
-6364, -631, -126, -34, -13, -6, -4452, -2156, 0};
-static const int16_t tcinv_b[NUMBER_OF_TCINV_POINTS] = {
+static const s16 tcinv_b[NUMBER_OF_TCINV_POINTS] = {
8191, 1828, 726, 352, 197, 121, 80, 55, 40};
-static const int16_t tcinv_c[NUMBER_OF_TCINV_POINTS] = {
+static const s16 tcinv_c[NUMBER_OF_TCINV_POINTS] = {
1, 1, 1, 1, 1, 1, 0, 0, 0};
-static const int16_t fcinv_x[NUMBER_OF_FCINV_POINTS] = {
+static const s16 fcinv_x[NUMBER_OF_FCINV_POINTS] = {
0, 80, 216, 456, 824, 1344, 2040, 2952, 4096};
-static const int16_t fcinv_a[NUMBER_OF_FCINV_POINTS] = {
+static const s16 fcinv_a[NUMBER_OF_FCINV_POINTS] = {
-5244, -486, -86, -2849, -961, -400, -180, -86, 0};
-static const int16_t fcinv_b[NUMBER_OF_FCINV_POINTS] = {
+static const s16 fcinv_b[NUMBER_OF_FCINV_POINTS] = {
8191, 1637, 607, 287, 159, 98, 64, 44, 32};
-static const int16_t fcinv_c[NUMBER_OF_FCINV_POINTS] = {
+static const s16 fcinv_c[NUMBER_OF_FCINV_POINTS] = {
1, 1, 1, 0, 0, 0, 0, 0, 0};
-
void
ia_css_eed1_8_vmem_encode(
struct eed1_8_vmem_params *to,
--
2.15.0
[PATCH v2 0/3] Sparse fixes for the Atom ISP Staging Driver
Fixed some sparse warnings in the Atom ISP staging driver and the checkpatch warnings that affected my patches. This time with longer commit messages. :) Jeremy Sowden (3): media: staging: atomisp: fix for sparse "using plain integer as NULL pointer" warnings. media: staging: atomisp: fixes for "symbol was not declared. Should it be static?" sparse warnings. media: staging: atomisp: fixed some checkpatch integer type warnings. .../isp/kernels/eed1_8/ia_css_eed1_8.host.c| 25 +++--- .../isp_param/interface/ia_css_isp_param_types.h | 2 +- 2 files changed, 13 insertions(+), 14 deletions(-) base-commit: 844056fd74ebdd826bd23a7d989597e15f478acb -- 2.15.0
[PATCH 0/3] Sparse fixes for the Atom ISP Staging Driver
Fixed some sparse warnings in the Atom ISP staging driver and the checkpatch warnings that affected my patches. Jeremy Sowden (3): media: staging: atomisp: address member of struct ia_css_host_data is a pointer-to-char, so define default as NULL. media: staging: atomisp: defined as static some const arrays which don't need external linkage. media: staging: atomisp: prefer s16 to int16_t. .../isp/kernels/eed1_8/ia_css_eed1_8.host.c| 25 +++--- .../isp_param/interface/ia_css_isp_param_types.h | 2 +- 2 files changed, 13 insertions(+), 14 deletions(-) base-commit: 844056fd74ebdd826bd23a7d989597e15f478acb -- 2.15.0
[PATCH 3/3] media: staging: atomisp: prefer s16 to int16_t.
Signed-off-by: Jeremy Sowden <jer...@azazel.net>
---
.../isp/kernels/eed1_8/ia_css_eed1_8.host.c| 25 +++---
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8.host.c
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8.host.c
index 47bb5042381b..af6c8688876d 100644
---
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8.host.c
+++
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8.host.c
@@ -32,47 +32,46 @@
#define NUMBER_OF_TCINV_POINTS 9
#define NUMBER_OF_FCINV_POINTS 9
-static const int16_t chgrinv_x[NUMBER_OF_CHGRINV_POINTS] = {
+static const s16 chgrinv_x[NUMBER_OF_CHGRINV_POINTS] = {
0, 16, 64, 144, 272, 448, 672, 976,
1376, 1888, 2528, 3312, 4256, 5376, 6688};
-static const int16_t chgrinv_a[NUMBER_OF_CHGRINV_POINTS] = {
+static const s16 chgrinv_a[NUMBER_OF_CHGRINV_POINTS] = {
-7171, -256, -29, -3456, -1071, -475, -189, -102,
-48, -38, -10, -9, -7, -6, 0};
-static const int16_t chgrinv_b[NUMBER_OF_CHGRINV_POINTS] = {
+static const s16 chgrinv_b[NUMBER_OF_CHGRINV_POINTS] = {
8191, 1021, 256, 114, 60, 37, 24, 17,
12, 9, 6, 5, 4, 3, 2};
-static const int16_t chgrinv_c[NUMBER_OF_CHGRINV_POINTS] = {
+static const s16 chgrinv_c[NUMBER_OF_CHGRINV_POINTS] = {
1, 1, 1, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0};
-static const int16_t tcinv_x[NUMBER_OF_TCINV_POINTS] = {
+static const s16 tcinv_x[NUMBER_OF_TCINV_POINTS] = {
0, 4, 11, 23, 42, 68, 102, 148, 205};
-static const int16_t tcinv_a[NUMBER_OF_TCINV_POINTS] = {
+static const s16 tcinv_a[NUMBER_OF_TCINV_POINTS] = {
-6364, -631, -126, -34, -13, -6, -4452, -2156, 0};
-static const int16_t tcinv_b[NUMBER_OF_TCINV_POINTS] = {
+static const s16 tcinv_b[NUMBER_OF_TCINV_POINTS] = {
8191, 1828, 726, 352, 197, 121, 80, 55, 40};
-static const int16_t tcinv_c[NUMBER_OF_TCINV_POINTS] = {
+static const s16 tcinv_c[NUMBER_OF_TCINV_POINTS] = {
1, 1, 1, 1, 1, 1, 0, 0, 0};
-static const int16_t fcinv_x[NUMBER_OF_FCINV_POINTS] = {
+static const s16 fcinv_x[NUMBER_OF_FCINV_POINTS] = {
0, 80, 216, 456, 824, 1344, 2040, 2952, 4096};
-static const int16_t fcinv_a[NUMBER_OF_FCINV_POINTS] = {
+static const s16 fcinv_a[NUMBER_OF_FCINV_POINTS] = {
-5244, -486, -86, -2849, -961, -400, -180, -86, 0};
-static const int16_t fcinv_b[NUMBER_OF_FCINV_POINTS] = {
+static const s16 fcinv_b[NUMBER_OF_FCINV_POINTS] = {
8191, 1637, 607, 287, 159, 98, 64, 44, 32};
-static const int16_t fcinv_c[NUMBER_OF_FCINV_POINTS] = {
+static const s16 fcinv_c[NUMBER_OF_FCINV_POINTS] = {
1, 1, 1, 0, 0, 0, 0, 0, 0};
-
void
ia_css_eed1_8_vmem_encode(
struct eed1_8_vmem_params *to,
--
2.15.0
[PATCH 2/3] media: staging: atomisp: defined as static some const arrays which don't need external linkage.
Signed-off-by: Jeremy Sowden <jer...@azazel.net>
---
.../isp/kernels/eed1_8/ia_css_eed1_8.host.c| 24 +++---
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8.host.c
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8.host.c
index 682f8b709ff9..47bb5042381b 100644
---
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8.host.c
+++
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8.host.c
@@ -32,44 +32,44 @@
#define NUMBER_OF_TCINV_POINTS 9
#define NUMBER_OF_FCINV_POINTS 9
-const int16_t chgrinv_x[NUMBER_OF_CHGRINV_POINTS] = {
+static const int16_t chgrinv_x[NUMBER_OF_CHGRINV_POINTS] = {
0, 16, 64, 144, 272, 448, 672, 976,
1376, 1888, 2528, 3312, 4256, 5376, 6688};
-const int16_t chgrinv_a[NUMBER_OF_CHGRINV_POINTS] = {
+static const int16_t chgrinv_a[NUMBER_OF_CHGRINV_POINTS] = {
-7171, -256, -29, -3456, -1071, -475, -189, -102,
-48, -38, -10, -9, -7, -6, 0};
-const int16_t chgrinv_b[NUMBER_OF_CHGRINV_POINTS] = {
+static const int16_t chgrinv_b[NUMBER_OF_CHGRINV_POINTS] = {
8191, 1021, 256, 114, 60, 37, 24, 17,
12, 9, 6, 5, 4, 3, 2};
-const int16_t chgrinv_c[NUMBER_OF_CHGRINV_POINTS] = {
+static const int16_t chgrinv_c[NUMBER_OF_CHGRINV_POINTS] = {
1, 1, 1, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0};
-const int16_t tcinv_x[NUMBER_OF_TCINV_POINTS] = {
+static const int16_t tcinv_x[NUMBER_OF_TCINV_POINTS] = {
0, 4, 11, 23, 42, 68, 102, 148, 205};
-const int16_t tcinv_a[NUMBER_OF_TCINV_POINTS] = {
+static const int16_t tcinv_a[NUMBER_OF_TCINV_POINTS] = {
-6364, -631, -126, -34, -13, -6, -4452, -2156, 0};
-const int16_t tcinv_b[NUMBER_OF_TCINV_POINTS] = {
+static const int16_t tcinv_b[NUMBER_OF_TCINV_POINTS] = {
8191, 1828, 726, 352, 197, 121, 80, 55, 40};
-const int16_t tcinv_c[NUMBER_OF_TCINV_POINTS] = {
+static const int16_t tcinv_c[NUMBER_OF_TCINV_POINTS] = {
1, 1, 1, 1, 1, 1, 0, 0, 0};
-const int16_t fcinv_x[NUMBER_OF_FCINV_POINTS] = {
+static const int16_t fcinv_x[NUMBER_OF_FCINV_POINTS] = {
0, 80, 216, 456, 824, 1344, 2040, 2952, 4096};
-const int16_t fcinv_a[NUMBER_OF_FCINV_POINTS] = {
+static const int16_t fcinv_a[NUMBER_OF_FCINV_POINTS] = {
-5244, -486, -86, -2849, -961, -400, -180, -86, 0};
-const int16_t fcinv_b[NUMBER_OF_FCINV_POINTS] = {
+static const int16_t fcinv_b[NUMBER_OF_FCINV_POINTS] = {
8191, 1637, 607, 287, 159, 98, 64, 44, 32};
-const int16_t fcinv_c[NUMBER_OF_FCINV_POINTS] = {
+static const int16_t fcinv_c[NUMBER_OF_FCINV_POINTS] = {
1, 1, 1, 0, 0, 0, 0, 0, 0};
--
2.15.0
[PATCH 1/3] media: staging: atomisp: address member of struct ia_css_host_data is a pointer-to-char, so define default as NULL.
Signed-off-by: Jeremy Sowden <jer...@azazel.net>
---
.../css2400/runtime/isp_param/interface/ia_css_isp_param_types.h| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isp_param/interface/ia_css_isp_param_types.h
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isp_param/interface/ia_css_isp_param_types.h
index 8e651b80345a..6fee3f7fd184 100644
---
a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isp_param/interface/ia_css_isp_param_types.h
+++
b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isp_param/interface/ia_css_isp_param_types.h
@@ -95,7 +95,7 @@ union ia_css_all_memory_offsets {
};
#define IA_CSS_DEFAULT_ISP_MEM_PARAMS \
- { { { { 0, 0 } } } }
+ { { { { NULL, 0 } } } }
#define IA_CSS_DEFAULT_ISP_CSS_PARAMS \
{ { { { 0, 0 } } } }
--
2.15.0
