Skip to content

Commit a89eeb9

Browse files
nathanchancemchehab
authored andcommitted
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: ClangBuiltLinux#1557 Link: https://lore.kernel.org/linux-media/20211227164243.2329724-1-nathan@kernel.org Fixes: 4005ece ("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>
1 parent 68b9bcc commit a89eeb9

1 file changed

Lines changed: 0 additions & 2 deletions

File tree

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@
2929
#include "isp_acquisition_defs.h"
3030
#include "input_system_ctrl_defs.h"
3131

32-
typedef struct input_system_cfg2400_s input_system_cfg2400_t;
33-
3432
struct target_cfg2400_s {
3533
input_switch_cfg_channel_t input_switch_channel_cfg;
3634
target_isp_cfg_t target_isp_cfg;

0 commit comments

Comments
 (0)