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

media: atomisp: Do not define input_system_cfg2400_t twice

When CONFIG_VIDEO_ATOMISP_ISP2401 is disabled, clang warns:

./drivers/staging/media/atomisp//pci/isp2400_input_system_local.h:32:40:
error: redefinition of typedef 'input_system_cfg2400_t' is a C11 feature
[-Werror,-Wtypedef-redefinition]
typedef struct input_system_cfg2400_s input_system_cfg2400_t;
^
./drivers/staging/media/atomisp//pci/input_system_local.h:22:40: note:
previous definition is here
typedef struct input_system_cfg2400_s input_system_cfg2400_t;
^
1 error generated.

input_system_cfg2400_t's typedef was copied from
isp2400_input_system_local.h to input_system_local.h, rather than moved.
Remove the one in isp2400_input_system_local.h so that there is no more
warning, which can break the build under -Werror.

Link: https://github.com/ClangBuiltLinux/linux/issues/1557

Link: https://lore.kernel.org/linux-media/20211227164243.2329724-1-nathan@kernel.org
Fixes: 4005ecee616a ("media: atomisp: shift some structs from input_system_local")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

authored by

Nathan Chancellor and committed by
Mauro Carvalho Chehab
a89eeb99 68b9bcc8

-2
-2
drivers/staging/media/atomisp/pci/isp2400_input_system_local.h
··· 29 29 #include "isp_acquisition_defs.h" 30 30 #include "input_system_ctrl_defs.h" 31 31 32 - typedef struct input_system_cfg2400_s input_system_cfg2400_t; 33 - 34 32 struct target_cfg2400_s { 35 33 input_switch_cfg_channel_t input_switch_channel_cfg; 36 34 target_isp_cfg_t target_isp_cfg;