address W=1 warnings at staging/media/atomisp
Subsystems (4)
cover address W=1 warnings at staging/media/atomisp
The linux-media policy is to have zero warnings with W=1. However, when I started using a Jenkins instance at https://builder.linuxtv.org to automate such tests, I didn't notice that a bug at the scripts were just ignoring warnings.
Now that this is fixed, we need to get rid of the warnings that got re-introduced when the atomisp driver was reverted, as otherwise, every time a common header is touched, we'll see messages like those:
Error/warnings:
patches/0001-media-mxl5xx-remove-unused-including-linux-version.h.patch:
allyesconfig: return code #0:
../drivers/staging/media/atomisp/pci/atomisp_compat_css20.c:164:2: warning: function ‘atomisp_css2_dbg_print’ might be a candidate for ‘gnu_printf’ format attribute [-Wsuggest-attribute=format] ../drivers/staging/media/atomisp/pci/atomisp_compat_css20.c:170:2: warning: function ‘atomisp_css2_dbg_ftrace_print’ might be a candidate for ‘gnu_printf’ format attribute [-Wsuggest-attribute=format] ../drivers/staging/media/atomisp/pci/atomisp_compat_css20.c:170:2: warning: function ‘atomisp_css2_dbg_ftrace_print’ might be a candidate for ‘gnu_printf’ format attribute [-Wsuggest-attribute=format] ../drivers/staging/media/atomisp/pci/atomisp_compat_css20.c:176:2: warning: function ‘atomisp_css2_err_print’ might be a candidate for ‘gnu_printf’ format attribute [-Wsuggest-attribute=format] ../drivers/staging/media/atomisp/pci/atomisp_cmd.c:2814:31: warning: variable ‘stream_config’ set but not used [-Wunused-but-set-variable] ../drivers/staging/media/atomisp/pci/atomisp_cmd.c:2893:31: warning: variable ‘stream_config’ set but not used [-Wunused-but-set-variable] ../drivers/staging/media/atomisp/pci/atomisp_v4l2.c:1432:15: warning: variable ‘a0_max_id’ set but not used [-Wunused-but-set-variable] ../drivers/staging/media/atomisp/pci/sh_css_mipi.c:410:27: warning: variable ‘mipi_intermediate_info’ set but not used [-Wunused-but-set-variable] ../drivers/staging/media/atomisp/pci/sh_css.c:1366:24: warning: variable ‘stream’ set but not used [-Wunused-but-set-variable] ../drivers/staging/media/atomisp/pci/sh_css.c:2702:22: warning: variable ‘capture_pipe’ set but not used [-Wunused-but-set-variable] ../drivers/staging/media/atomisp/pci/sh_css.c:2831:7: warning: variable ‘continuous’ set but not used [-Wunused-but-set-variable] ../drivers/staging/media/atomisp/pci/sh_css.c:3534:15: warning: variable ‘num_output_pins’ set but not used [-Wunused-but-set-variable] ../drivers/staging/media/atomisp/pci/sh_css.c:3937:55: warning: variable ‘vf_pp_binary’ set but not used [-Wunused-but-set-variable] ../drivers/staging/media/atomisp/pci/sh_css.c:3937:38: warning: variable ‘preview_binary’ set but not used [-Wunused-but-set-variable] ../drivers/staging/media/atomisp/pci/sh_css.c:3937:24: warning: variable ‘copy_binary’ set but not used [-Wunused-but-set-variable] ../drivers/staging/media/atomisp/pci/sh_css.c:3936:26: warning: variable ‘me’ set but not used [-Wunused-but-set-variable] ../drivers/staging/media/atomisp/pci/sh_css.c:5749:24: warning: variable ‘copy_binary’ set but not used [-Wunused-but-set-variable] ../drivers/staging/media/atomisp/pci/sh_css.c:6013:7: warning: variable ‘continuous’ set but not used [-Wunused-but-set-variable] ../drivers/staging/media/atomisp/pci/sh_css.c:6012:7: warning: variable ‘memory’ set but not used [-Wunused-but-set-variable] ../drivers/staging/media/atomisp/pci/sh_css.c:7329:24: warning: variable ‘copy_binary’ set but not used [-Wunused-but-set-variable] ../drivers/staging/media/atomisp/pci/sh_css.c:7459:26: warning: variable ‘num_vf_pp_stage’ set but not used [-Wunused-but-set-variable] ../drivers/staging/media/atomisp/pci/sh_css.c:10420:22: warning: variable ‘pipe_id’ set but not used [-Wunused-but-set-variable] ../drivers/staging/media/atomisp/pci/sh_css_param_shading.c:239:4: warning: variable ‘padded_width’ set but not used [-Wunused-but-set-variable] ../drivers/staging/media/atomisp/pci/sh_css_params.c:1099:36: warning: variable ‘row_padding’ set but not used [-Wunused-but-set-variable] ../drivers/staging/media/atomisp/pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c:237:31: warning: variable ‘isp_data_ptr’ set but not used [-Wunused-but-set-variable] ../drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c:119:28: warning: variable ‘ver_num_isp’ set but not used [-Wunused-but-set-variable] ../drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c:119:15: warning: variable ‘hor_num_isp’ set but not used [-Wunused-but-set-variable] ../drivers/staging/media/atomisp/pci/isp/kernels/vf/vf_1.0/ia_css_vf.host.c:127:6: warning: variable ‘err’ set but not used [-Wunused-but-set-variable]
In file included from ../drivers/staging/media/atomisp//pci/hive_isp_css_include/input_formatter.h:34,
from ../drivers/staging/media/atomisp/pci/runtime/debug/src/ia_css_debug.c:55:
../drivers/staging/media/atomisp//pci/hive_isp_css_common/host/input_formatter_local.h:118:27: warning: ‘input_formatter_alignment’ defined but not used [-Wunused-const-variable=] ../drivers/staging/media/atomisp/pci/runtime/rmgr/src/rmgr_vbuf.c:244:7: warning: variable ‘succes’ set but not used [-Wunused-but-set-variable]
allyesconfig: return code #0:
../drivers/media/v4l2-core/v4l2-ioctl.c: ../drivers/media/v4l2-core/v4l2-ioctl.c:3204 video_put_user() warn: check that 'ev32' doesn't leak information (struct has a hole after 'type') ../drivers/media/v4l2-core/v4l2-ioctl.c: ../drivers/media/v4l2-core/v4l2-ioctl.c:3229 video_put_user() warn: check that 'vb32' doesn't leak information (struct has a hole after 'memory') ../drivers/media/usb/em28xx/em28xx-video.c: ../drivers/media/usb/em28xx/em28xx-video.c:2841 em28xx_v4l2_init() parse error: turning off implications after 60 seconds ../drivers/media/test-drivers/vivid/vivid-core.c: ../drivers/media/test-drivers/vivid/vivid-core.c:1200 vivid_create_instance() parse error: turning off implications after 60 seconds ../drivers/media/test-drivers/vivid/vivid-core.c: ../drivers/media/test-drivers/vivid/vivid-core.c:1531 vivid_create_instance() parse error: __split_smt: function too hairy. Giving up after 301 seconds
This series solve all atomisp W=1 warnings.
Mauro Carvalho Chehab (5):
media: atomisp: get rid of some cleanup leftovers
media: atomisp: print a warning if error while setting downscaler
media: atomisp: get rid of unused vars
media: atomisp: move a static constant out of a header file
media: atomisp: get rid of -Wsuggest-attribute=format warnings
.../staging/media/atomisp/pci/atomisp_cmd.c | 6 --- .../media/atomisp/pci/atomisp_compat_css20.c | 20 ++------ .../staging/media/atomisp/pci/atomisp_v4l2.c | 3 -- .../host/input_formatter.c | 4 ++ .../host/input_formatter_local.h | 4 -- .../staging/media/atomisp/pci/ia_css_env.h | 4 +- .../isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c | 3 -- .../kernels/sdis/sdis_2/ia_css_sdis2.host.c | 3 -- .../isp/kernels/vf/vf_1.0/ia_css_vf.host.c | 5 ++ .../atomisp/pci/runtime/rmgr/src/rmgr_vbuf.c | 4 +- drivers/staging/media/atomisp/pci/sh_css.c | 47 ++----------------- .../staging/media/atomisp/pci/sh_css_mipi.c | 12 ----- .../media/atomisp/pci/sh_css_param_shading.c | 25 +++------- .../staging/media/atomisp/pci/sh_css_params.c | 3 +- 14 files changed, 29 insertions(+), 114 deletions(-)
Signature · 1 line
2.26.2
PATCH 1/5 media: atomisp: get rid of some cleanup leftovers
The code that used to check for ISP2400/2401 version were using the revision number in order to decide wheather version should be used. With the new version, the code doesn't need to check anymore for ISP version.
--- drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 3 --- 1 file changed, 3 deletions(-)
drivers/staging/media/atomisp/pci/atomisp_v4l2.c +0 -3
@@ -1429,7 +1429,6 @@ atomisp_load_firmware(struct atomisp_device *isp)*/ static bool is_valid_device (struct pci_dev *pdev,const struct pci_device_id *id) { -unsigned int a0_max_id =0 ;const char *name;const char *product;
@@ -1437,11 +1436,9 @@ static bool is_valid_device(struct pci_dev *pdev, const struct pci_device_id *idswitch (id->device &ATOMISP_PCI_DEVICE_SOC_MASK ) {case ATOMISP_PCI_DEVICE_SOC_MRFLD : - a0_max_id =ATOMISP_PCI_REV_MRFLD_A0_MAX ; name ="Merrifield" ;break ;case ATOMISP_PCI_DEVICE_SOC_BYT : - a0_max_id =ATOMISP_PCI_REV_BYT_A0_MAX ; name ="Baytrail" ;break ;case ATOMISP_PCI_DEVICE_SOC_ANN :
Signature · 1 line
2.26.2
PATCH 2/5 media: atomisp: print a warning if error while setting downscaler
In reply to Mauro Carvalho ChehabAs warned by gcc:
drivers/staging/media/atomisp//pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c:237:31: warning: variable ‘isp_data_ptr’ set but not used [-Wunused-but-set-variable]
ia_css_vf_configure() logic has an error var that detects troubles when setting the kernel for downscaling. The driver just ignores it, without producing any warning. Add at least a warning message on such cases.
--- .../media/atomisp/pci/isp/kernels/vf/vf_1.0/ia_css_vf.host.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/staging/media/atomisp/pci/isp/kernels/vf/vf_1.0/ia_css_vf.host.c +5 -0
@@ -13,6 +13,8 @@* more details. */ +#include "atomisp_internal.h" +#include "ia_css_vf.host.h" #include <assert_support.h> #include <ia_css_err.h>
@@ -129,6 +131,9 @@ ia_css_vf_configure(const struct ia_css_binary_info *info = &binary->info->sp; err =configure_kernel (info, out_info, vf_info, downscale_log2, &config); +if (err) +dev_warn (atomisp_dev,"Couldn't setup downscale\n" ); +configure_dma (&config, vf_info);if (vf_info)
Signature · 1 line
2.26.2
PATCH 3/5 media: atomisp: get rid of unused vars
In reply to Mauro Carvalho ChehabThere are several vars declared and set but unused:
drivers/staging/media/atomisp//pci/sh_css_param_shading.c:239:4: warning: variable ‘padded_width’ set but not used [-Wunused-but-set-variable] drivers/staging/media/atomisp//pci/sh_css.c:1366:24: warning: variable ‘stream’ set but not used [-Wunused-but-set-variable] drivers/staging/media/atomisp//pci/sh_css.c:2702:22: warning: variable ‘capture_pipe’ set but not used [-Wunused-but-set-variable] drivers/staging/media/atomisp//pci/sh_css.c:2831:7: warning: variable ‘continuous’ set but not used [-Wunused-but-set-variable] drivers/staging/media/atomisp//pci/sh_css.c:3534:15: warning: variable ‘num_output_pins’ set but not used [-Wunused-but-set-variable] drivers/staging/media/atomisp//pci/sh_css.c:3937:55: warning: variable ‘vf_pp_binary’ set but not used [-Wunused-but-set-variable] drivers/staging/media/atomisp//pci/sh_css.c:3937:38: warning: variable ‘preview_binary’ set but not used [-Wunused-but-set-variable] drivers/staging/media/atomisp//pci/sh_css.c:3937:24: warning: variable ‘copy_binary’ set but not used [-Wunused-but-set-variable] drivers/staging/media/atomisp//pci/sh_css.c:3936:26: warning: variable ‘me’ set but not used [-Wunused-but-set-variable] drivers/staging/media/atomisp//pci/sh_css.c:5749:24: warning: variable ‘copy_binary’ set but not used [-Wunused-but-set-variable] drivers/staging/media/atomisp//pci/sh_css.c:6013:7: warning: variable ‘continuous’ set but not used [-Wunused-but-set-variable] drivers/staging/media/atomisp//pci/sh_css.c:6012:7: warning: variable ‘memory’ set but not used [-Wunused-but-set-variable] drivers/staging/media/atomisp//pci/sh_css.c:7329:24: warning: variable ‘copy_binary’ set but not used [-Wunused-but-set-variable] drivers/staging/media/atomisp//pci/sh_css.c:7459:26: warning: variable ‘num_vf_pp_stage’ set but not used [-Wunused-but-set-variable] drivers/staging/media/atomisp//pci/sh_css.c:10420:22: warning: variable ‘pipe_id’ set but not used [-Wunused-but-set-variable] drivers/staging/media/atomisp//pci/sh_css_params.c:1099:36: warning: variable ‘row_padding’ set but not used [-Wunused-but-set-variable] drivers/staging/media/atomisp//pci/sh_css_mipi.c:410:27: warning: variable ‘mipi_intermediate_info’ set but not used [-Wunused-but-set-variable] drivers/staging/media/atomisp//pci/atomisp_cmd.c:2814:31: warning: variable ‘stream_config’ set but not used [-Wunused-but-set-variable] drivers/staging/media/atomisp//pci/atomisp_cmd.c:2893:31: warning: variable ‘stream_config’ set but not used [-Wunused-but-set-variable] drivers/staging/media/atomisp//pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c:237:31: warning: variable ‘isp_data_ptr’ set but not used [-Wunused-but-set-variable] drivers/staging/media/atomisp//pci/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c:119:28: warning: variable ‘ver_num_isp’ set but not used [-Wunused-but-set-variable] drivers/staging/media/atomisp//pci/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c:119:15: warning: variable ‘hor_num_isp’ set but not used [-Wunused-but-set-variable]
--- .../staging/media/atomisp/pci/atomisp_cmd.c | 6 --- .../isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c | 3 -- .../kernels/sdis/sdis_2/ia_css_sdis2.host.c | 3 -- .../atomisp/pci/runtime/rmgr/src/rmgr_vbuf.c | 4 +- drivers/staging/media/atomisp/pci/sh_css.c | 47 ++----------------- .../staging/media/atomisp/pci/sh_css_mipi.c | 12 ----- .../media/atomisp/pci/sh_css_param_shading.c | 25 +++------- .../staging/media/atomisp/pci/sh_css_params.c | 3 +- 8 files changed, 14 insertions(+), 89 deletions(-)
drivers/staging/media/atomisp/pci/atomisp_cmd.c +0 -6
@@ -2811,7 +2811,6 @@ int atomisp_get_metadata(struct atomisp_sub_device *asd, int flag, struct atomisp_metadata *md) {struct atomisp_device *isp = asd->isp; -struct ia_css_stream_config *stream_config;struct ia_css_stream_info *stream_info;struct camera_mipi_info *mipi_info;struct atomisp_metadata_buf *md_buf;
@@ -2821,8 +2820,6 @@ int atomisp_get_metadata(struct atomisp_sub_device *asd, int flag,if (flag !=0 )return -EINVAL ; - stream_config = &asd->stream_env[ATOMISP_INPUT_STREAM_GENERAL ]. - stream_config; stream_info = &asd->stream_env[ATOMISP_INPUT_STREAM_GENERAL ]. stream_info;
@@ -2890,7 +2887,6 @@ int atomisp_get_metadata_by_type(struct atomisp_sub_device *asd, int flag, struct atomisp_metadata_with_type *md) {struct atomisp_device *isp = asd->isp; -struct ia_css_stream_config *stream_config;struct ia_css_stream_info *stream_info;struct camera_mipi_info *mipi_info;struct atomisp_metadata_buf *md_buf;
@@ -2900,8 +2896,6 @@ int atomisp_get_metadata_by_type(struct atomisp_sub_device *asd, int flag,if (flag !=0 )return -EINVAL ; - stream_config = &asd->stream_env[ATOMISP_INPUT_STREAM_GENERAL ]. - stream_config; stream_info = &asd->stream_env[ATOMISP_INPUT_STREAM_GENERAL ]. stream_info;
drivers/staging/media/atomisp/pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c +0 -3
@@ -234,7 +234,6 @@ convert_allocate_dvs_6axis_config(unsigned int o_width;unsigned int o_height;struct ia_css_host_data *me; -struct gdc_warp_param_mem_s *isp_data_ptr;assert (binary);assert (dvs_6axis_config);
@@ -249,8 +248,6 @@ convert_allocate_dvs_6axis_config(assert ((dvs_in_frame_info->format ==IA_CSS_FRAME_FORMAT_NV12 ) || (dvs_in_frame_info->format ==IA_CSS_FRAME_FORMAT_YUV420 )); - isp_data_ptr = (struct gdc_warp_param_mem_s *)me->address; - i_stride = dvs_in_frame_info->padded_width; o_width = binary->out_frame_info[0 ].res.width;
drivers/staging/media/atomisp/pci/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c +0 -3
@@ -116,7 +116,6 @@ void ia_css_get_isp_dvs2_coefficients( {struct ia_css_isp_parameters *params;unsigned int hor_num_3a, ver_num_3a; -unsigned int hor_num_isp, ver_num_isp;struct ia_css_binary *dvs_binary;IA_CSS_ENTER ("void" );
@@ -140,8 +139,6 @@ void ia_css_get_isp_dvs2_coefficients( hor_num_3a = dvs_binary->dis.coef.dim.width; ver_num_3a = dvs_binary->dis.coef.dim.height; - hor_num_isp = dvs_binary->dis.coef.pad.width; - ver_num_isp = dvs_binary->dis.coef.pad.height;memcpy (hor_coefs_odd_real, params->dvs2_coefs.hor_coefs.odd_real, hor_num_3a *sizeof (short ));
drivers/staging/media/atomisp/pci/runtime/rmgr/src/rmgr_vbuf.c +1 -3
@@ -241,7 +241,6 @@ void rmgr_pop_handle(struct ia_css_rmgr_vbuf_pool *pool, struct ia_css_rmgr_vbuf_handle **handle) {u32 i; -bool succes = false;assert (pool);assert (pool->recycle);
@@ -255,8 +254,7 @@ void rmgr_pop_handle(struct ia_css_rmgr_vbuf_pool *pool, pool->handles[i] =NULL ;/* dont release, we are returning it... ia_css_rmgr_refcount_release_vbuf(handle); */ - succes = true; -break ; +return ; } } }
drivers/staging/media/atomisp/pci/sh_css.c +5 -42
174 lines not on this page · raw message
drivers/staging/media/atomisp/pci/sh_css_mipi.c +0 -12
@@ -407,7 +407,6 @@ allocate_mipi_frames(struct ia_css_pipe *pipe, struct ia_css_stream_info *info) {int err = -EINVAL ;unsigned int port; -struct ia_css_frame_info mipi_intermediate_info;ia_css_debug_dtrace (IA_CSS_DEBUG_TRACE_PRIVATE ,"allocate_mipi_frames(%p) enter:\n" , pipe);
@@ -486,17 +485,6 @@ allocate_mipi_frames(struct ia_css_pipe *pipe, ref_count_mipi_allocation[port]++; -/* TODO: Cleaning needed. */ -/* This code needs to modified to allocate the MIPI frames in the correct normal way -with an allocate from info, by justin */ - mipi_intermediate_info = pipe->pipe_settings.video.video_binary.internal_frame_info; - mipi_intermediate_info.res.width =0 ; - mipi_intermediate_info.res.height =0 ; -/* To indicate it is not (yet) valid format. */ - mipi_intermediate_info.format =IA_CSS_FRAME_FORMAT_NUM ; - mipi_intermediate_info.padded_width =0 ; - mipi_intermediate_info.raw_bit_depth =0 ; -/* AM TODO: mipi frames number should come from stream struct. */ my_css.num_mipi_frames[port] =NUM_MIPI_FRAMES_PER_STREAM ;
drivers/staging/media/atomisp/pci/sh_css_param_shading.c +7 -18
@@ -230,15 +230,8 @@ prepare_shading_table(const struct ia_css_shading_table *in_table,const struct ia_css_binary *binary, unsigned int bds_factor) { - unsigned int input_width, - input_height, - table_width, - table_height, - left_padding, - top_padding, - padded_width, - left_cropping, - i; + unsigned int input_width, input_height, table_width, table_height, i; +unsigned int left_padding, top_padding, left_cropping;unsigned int bds_numerator, bds_denominator;int right_padding;
@@ -254,15 +247,11 @@ prepare_shading_table(const struct ia_css_shading_table *in_table,return ; } - padded_width = binary->in_frame_info.padded_width; -/* We use the ISP input resolution for the shading table because -shading correction is performed in the bayer domain (before bayer -down scaling). */ -#if defined(ISP2401 ) - padded_width =CEIL_MUL (binary->effective_in_frame_res.width +2 * -ISP_VEC_NELEMS , -2 *ISP_VEC_NELEMS ); -#endif +/* +* We use the ISP input resolution for the shading table because +* shading correction is performed in the bayer domain (before bayer +* down scaling). +*/ input_height = binary->in_frame_info.res.height; input_width = binary->in_frame_info.res.width; left_padding = binary->left_padding;
drivers/staging/media/atomisp/pci/sh_css_params.c +1 -2
@@ -1096,7 +1096,7 @@ ia_css_params_alloc_convert_sctbl( {const struct ia_css_binary *binary = stage->binary;struct ia_css_host_data *sctbl; -unsigned int i, j, aligned_width, row_padding; +unsigned int i, j, aligned_width;unsigned int sctbl_size;short int *ptr;
@@ -1111,7 +1111,6 @@ ia_css_params_alloc_convert_sctbl( } aligned_width = binary->sctbl_aligned_width_per_color; - row_padding = aligned_width - shading_table->width; sctbl_size = shading_table->height *IA_CSS_SC_NUM_COLORS * aligned_width *sizeof (short );
Signature · 1 line
2.26.2
PATCH 4/5 media: atomisp: move a static constant out of a header file
In reply to Mauro Carvalho ChehabGcc reports that input_formatter_alignment is not used:
In file included from ./drivers/staging/media/atomisp//pci/hive_isp_css_include/input_formatter.h:34,
from drivers/staging/media/atomisp//pci/runtime/debug/src/ia_css_debug.c:55:
./drivers/staging/media/atomisp//pci/hive_isp_css_common/host/input_formatter_local.h:118:27: warning: ‘input_formatter_alignment’ defined but not used [-Wunused-const-variable=]
However, it is, but only inside input_formatter.c.
So, move it out of the header file.
--- .../atomisp/pci/hive_isp_css_common/host/input_formatter.c | 4 ++++ .../pci/hive_isp_css_common/host/input_formatter_local.h | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_formatter.c +4 -0
@@ -27,6 +27,10 @@#include "input_formatter_private.h" #endif /* __INLINE_INPUT_FORMATTER__ */ +static const unsigned int input_formatter_alignment[N_INPUT_FORMATTER_ID ] = { +ISP_VEC_ALIGN ,ISP_VEC_ALIGN ,HIVE_ISP_CTRL_DATA_BYTES +}; +const hrt_address HIVE_IF_SRST_ADDRESS [N_INPUT_FORMATTER_ID ] = {INPUT_FORMATTER0_SRST_OFFSET ,INPUT_FORMATTER1_SRST_OFFSET ,
drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_formatter_local.h +0 -4
@@ -115,8 +115,4 @@ struct input_formatter_bin_state_s { u32 en_status_update; }; -static const unsigned int input_formatter_alignment[N_INPUT_FORMATTER_ID ] = { -ISP_VEC_ALIGN ,ISP_VEC_ALIGN ,HIVE_ISP_CTRL_DATA_BYTES -}; -#endif /* __INPUT_FORMATTER_LOCAL_H_INCLUDED__ */
Signature · 1 line
2.26.2
PATCH 5/5 media: atomisp: get rid of -Wsuggest-attribute=format warnings
In reply to Mauro Carvalho ChehabThere are some warnings reported by gcc:
drivers/staging/media/atomisp//pci/atomisp_compat_css20.c:164:2: warning: function ‘atomisp_css2_dbg_print’ might be a candidate for ‘gnu_printf’ format attribute [-Wsuggest-attribute=format] drivers/staging/media/atomisp//pci/atomisp_compat_css20.c:170:2: warning: function ‘atomisp_css2_dbg_ftrace_print’ might be a candidate for ‘gnu_printf’ format attribute [-Wsuggest-attribute=format] drivers/staging/media/atomisp//pci/atomisp_compat_css20.c:170:2: warning: function ‘atomisp_css2_dbg_ftrace_print’ might be a candidate for ‘gnu_printf’ format attribute [-Wsuggest-attribute=format] drivers/staging/media/atomisp//pci/atomisp_compat_css20.c:176:2: warning: function ‘atomisp_css2_err_print’ might be a candidate for ‘gnu_printf’ format attribute [-Wsuggest-attribute=format]
That are due to the usage of printf-like messages without enabling the error checking logic.
Add the proper attributes in order to shut up such warnings.
--- .../media/atomisp/pci/atomisp_compat_css20.c | 20 ++++--------------- .../staging/media/atomisp/pci/ia_css_env.h | 4 ++-- 2 files changed, 6 insertions(+), 18 deletions(-)
drivers/staging/media/atomisp/pci/atomisp_compat_css20.c +4 -16
@@ -159,24 +159,13 @@ static void atomisp_css2_hw_load(hrt_address addr, void *to, uint32_t n)spin_unlock_irqrestore (&mmio_lock, flags); } -static int atomisp_css2_dbg_print (const char *fmt,va_list args) -{ -vprintk (fmt, args); -return 0 ; -} - -static int atomisp_css2_dbg_ftrace_print (const char *fmt,va_list args) +static int __attribute__((format (printf,1 ,0 ))) +atomisp_css2_dbg_ftrace_print (const char *fmt,va_list args) {ftrace_vprintk (fmt, args);return 0 ; } -static int atomisp_css2_err_print (const char *fmt,va_list args) -{ -vprintk (fmt, args); -return 0 ; -} -void atomisp_load_uint32 (hrt_address addr,uint32_t *data) { *data =atomisp_css2_hw_load_32 (addr);
@@ -869,8 +858,7 @@ static inline int __set_css_print_env(struct atomisp_device *isp, int opt) isp->css_env.isp_css_env.print_env.debug_print = atomisp_css2_dbg_ftrace_print; else if (opt == 2) - isp->css_env.isp_css_env.print_env.debug_print = - atomisp_css2_dbg_print; + isp->css_env.isp_css_env.print_env.debug_print = vprintk; else ret = -EINVAL;
@@ -903,7 +891,7 @@ int atomisp_css_load_firmware(struct atomisp_device *isp)__set_css_print_env (isp, dbg_func); - isp->css_env.isp_css_env.print_env.error_print = atomisp_css2_err_print; + isp->css_env.isp_css_env.print_env.error_print = vprintk;/* load isp fw into ISP memory */ err = ia_css_load_firmware(isp->dev, &isp->css_env.isp_css_env,
drivers/staging/media/atomisp/pci/ia_css_env.h +2 -2
@@ -75,9 +75,9 @@ struct ia_css_hw_access_env {/* Environment with function pointers to print error and debug messages. */ struct ia_css_print_env { -int (*debug_print)(const char *fmt,va_list args); +int (*debug_print)(const char *fmt,va_list args) __attribute__((format (printf,1 ,0 )));/** Print a debug message. */ -int (*error_print)(const char *fmt,va_list args); +int (*error_print)(const char *fmt,va_list args) __attribute__((format (printf,1 ,0 )));/** Print an error message.*/ };
Signature · 1 line
2.26.2
Re: [PATCH 5/5] media: atomisp: get rid of -Wsuggest-attribute=format warnings
Quoted 12 lines · Mauro Carvalho Chehab
There are some warnings reported by gcc:
drivers/staging/media/atomisp//pci/atomisp_compat_css20.c:164:2: warning: function ‘atomisp_css2_dbg_print’ might be a candidate for ‘gnu_printf’ format attribute [-Wsuggest-attribute=format] drivers/staging/media/atomisp//pci/atomisp_compat_css20.c:170:2: warning: function ‘atomisp_css2_dbg_ftrace_print’ might be a candidate for ‘gnu_printf’ format attribute [-Wsuggest-attribute=format] drivers/staging/media/atomisp//pci/atomisp_compat_css20.c:170:2: warning: function ‘atomisp_css2_dbg_ftrace_print’ might be a candidate for ‘gnu_printf’ format attribute [-Wsuggest-attribute=format] drivers/staging/media/atomisp//pci/atomisp_compat_css20.c:176:2: warning: function ‘atomisp_css2_err_print’ might be a candidate for ‘gnu_printf’ format attribute [-Wsuggest-attribute=format]That are due to the usage of printf-like messages without enabling the error checking logic.
Add the proper attributes in order to shut up such warnings.
drivers/staging/media/atomisp/pci/atomisp_compat_css20.c static void atomisp_css2_hw_load(hrt_address addr, void *to, uint32_t n) · line 167
Quoted 6 lines
drivers/staging/media/atomisp/pci/atomisp_compat_css20.c +2
-0+static int __attribute__((format (printf,1 ,0 ))) +atomisp_css2_dbg_ftrace_print (const char *fmt,va_list args) {ftrace_vprintk (fmt, args);return 0 ; }
Why not to drop it completely as well?
Quoted 5 lines
drivers/staging/media/atomisp/pci/atomisp_compat_css20.c +0
-5-static int atomisp_css2_err_print (const char *fmt,va_list args) -{ -vprintk (fmt, args); -return 0 ; -}
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH 5/5] media: atomisp: get rid of -Wsuggest-attribute=format warnings
Em Thu, 3 Sep 2020 17:07:24 +0300
Andy Shevchenko <[email protected]> escreveu:
Quoted 12 lines · Mauro Carvalho Chehab
Quoted 10 lines
There are some warnings reported by gcc:
drivers/staging/media/atomisp//pci/atomisp_compat_css20.c:164:2: warning: function ‘atomisp_css2_dbg_print’ might be a candidate for ‘gnu_printf’ format attribute [-Wsuggest-attribute=format] drivers/staging/media/atomisp//pci/atomisp_compat_css20.c:170:2: warning: function ‘atomisp_css2_dbg_ftrace_print’ might be a candidate for ‘gnu_printf’ format attribute [-Wsuggest-attribute=format] drivers/staging/media/atomisp//pci/atomisp_compat_css20.c:170:2: warning: function ‘atomisp_css2_dbg_ftrace_print’ might be a candidate for ‘gnu_printf’ format attribute [-Wsuggest-attribute=format] drivers/staging/media/atomisp//pci/atomisp_compat_css20.c:176:2: warning: function ‘atomisp_css2_err_print’ might be a candidate for ‘gnu_printf’ format attribute [-Wsuggest-attribute=format]That are due to the usage of printf-like messages without enabling the error checking logic.
Add the proper attributes in order to shut up such warnings.
Quoted 9 lines
drivers/staging/media/atomisp/pci/atomisp_compat_css20.c static void atomisp_css2_hw_load(hrt_address addr, void *to, uint32_t n) · line 167
Quoted 7 lines
drivers/staging/media/atomisp/pci/atomisp_compat_css20.c +2
-0+static int __attribute__((format (printf,1 ,0 ))) +atomisp_css2_dbg_ftrace_print (const char *fmt,va_list args) {ftrace_vprintk (fmt, args);return 0 ; }Why not to drop it completely as well?
Because of this:
make -s CC="gcc -fno-diagnostics-show-caret" CF=-D__CHECK_ENDIAN__ CONFIG_DEBUG_SECTION_MISMATCH=y W=1 M=drivers/staging/media/atomisp/ 2>&1|grep -v ": In function ‘" drivers/staging/media/atomisp//pci/atomisp_compat_css20.c:858:52: error: ‘ftrace_vprintk’ undeclared (first use in this function); did you mean ‘tracepoint’? drivers/staging/media/atomisp//pci/atomisp_compat_css20.c:858:52: note: each undeclared identifier is reported only once for each function it appears in
Basically, kernel.h defines it as a macro:
#define ftrace_vprintk(fmt, vargs) \
do { \
if (__builtin_constant_p(fmt)) { \
static const char *trace_printk_fmt __used \
__attribute__((section("__trace_printk_fmt"))) = \
__builtin_constant_p(fmt) ? fmt : NULL; \
\
__ftrace_vbprintk(_THIS_IP_, trace_printk_fmt, vargs); \
} else \
__ftrace_vprintk(_THIS_IP_, fmt, vargs); \
} while (0)Now, a different thing would be to get rid of using trace as a debug mechanism. Right now, I don't have any strong opinion, but I guess that, while this driver is still at staging, it sounds good to be able of using traces instead of dmesg for debugging purposes, but to be honest, I didn't test yet to use ftrace for such purpose.
Thanks,
Mauro
kernel test robot
build botRe: [PATCH 5/5] media: atomisp: get rid of -Wsuggest-attribute=format warnings
In reply to Mauro Carvalho ChehabI love your patch! Yet something to improve:
Hi Mauro,
I love your patch! Yet something to improve:
[auto build test ERROR on linuxtv-media/master]
[cannot apply to staging/staging-testing linus/master v5.9-rc3 next-20200903] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Mauro-Carvalho-Chehab/address-W-1-warnings-at-staging-media-atomisp/20200903-220729 base: git://linuxtv.org/media_tree.git master config: i386-allyesconfig (attached as .config) compiler: gcc-9 (Debian 9.3.0-15) 9.3.0 reproduce (this is a W=1 build): # save the attached .config to linux build tree make W=1 ARCH=i386
If you fix the issue, kindly add following tag as appropriate
All error/warnings (new ones prefixed by >>):
drivers/staging/media/atomisp/pci/atomisp_compat_css20.c: In function '__set_css_print_env':
>> drivers/staging/media/atomisp/pci/atomisp_compat_css20.c:861:50: error: assignment to 'int (*)(const char *, char *)' from incompatible pointer type 'int (__attribute__((regparm(0))) *)(const char *, char *)' [-Werror=incompatible-pointer-types]
861 | isp->css_env.isp_css_env.print_env.debug_print = vprintk;
| ^
drivers/staging/media/atomisp/pci/atomisp_compat_css20.c: In function 'atomisp_css_load_firmware':
drivers/staging/media/atomisp/pci/atomisp_compat_css20.c:894:49: error: assignment to 'int (*)(const char *, char *)' from incompatible pointer type 'int (__attribute__((regparm(0))) *)(const char *, char *)' [-Werror=incompatible-pointer-types]
894 | isp->css_env.isp_css_env.print_env.error_print = vprintk;
| ^
cc1: some warnings being treated as errors
--
drivers/staging/media/atomisp/pci/sh_css.c: In function 'ia_css_init':
>> drivers/staging/media/atomisp/pci/sh_css.c:1685:16: warning: assignment left-hand side might be a candidate for a format attribute [-Wsuggest-attribute=format]
1685 | sh_css_printf = env->print_env.debug_print;
| ^# https://github.com/0day-ci/linux/commit/bee6e6549cd6c55a1d62347514bb1cb11acd6aca
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Mauro-Carvalho-Chehab/address-W-1-warnings-at-staging-media-atomisp/20200903-220729 git checkout bee6e6549cd6c55a1d62347514bb1cb11acd6aca
vim +861 drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
850
851 static inline int __set_css_print_env(struct atomisp_device *isp, int opt)
852 {
853 int ret = 0;
854
855 if (opt == 0)
856 isp->css_env.isp_css_env.print_env.debug_print = NULL;
857 else if (opt == 1)
858 isp->css_env.isp_css_env.print_env.debug_print =
859 atomisp_css2_dbg_ftrace_print;
860 else if (opt == 2)
> 861 isp->css_env.isp_css_env.print_env.debug_print = vprintk;
862 else
863 ret = -EINVAL;
864
865 return ret;
866 }
867
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Hi Greg,
Em Tue, 8 Sep 2020 12:12:21 +0200
Mauro Carvalho Chehab <[email protected]> escreveu:
Quoted 4 lines
The linux-media policy is to have zero warnings with W=1. However, when I started using a Jenkins instance at https://builder.linuxtv.org to automate such tests, I didn't notice that a bug at the scripts were just ignoring warnings.
Please ignore this patch series. It was sent by mistake instead of a completely unrelated one.
This was already merged via the media tree.
Thanks,
Mauro