Commit a89eeb99 authored Dec 27, 2021 by Nathan Chancellor Committed by Mauro Carvalho Chehab Jan 10, 2022

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: 4005ecee ("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>

parent 68b9bcc8

drivers/staging/media/atomisp/pci/isp2400_input_system_local.h

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -29,8 +29,6 @@
	#include "isp_acquisition_defs.h"		#include "isp_acquisition_defs.h"
	#include "input_system_ctrl_defs.h"		#include "input_system_ctrl_defs.h"

	typedef struct input_system_cfg2400_s input_system_cfg2400_t;

	struct target_cfg2400_s {		struct target_cfg2400_s {
	input_switch_cfg_channel_t input_switch_channel_cfg;		input_switch_cfg_channel_t input_switch_channel_cfg;
	target_isp_cfg_t target_isp_cfg;		target_isp_cfg_t target_isp_cfg;