Skip to contentSkip to conversation

media: atomisp: Do not define input_system_cfg2400_t twice

PATCH New Nathan Chancellor 1 participant 1 message Dec 27, 2021

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

Fixes 4005ecee616a ("media: atomisp: shift some structs from input_system_local")
---
 drivers/staging/media/atomisp/pci/isp2400_input_system_local.h | 2 --
 1 file changed, 2 deletions(-)
drivers/staging/media/atomisp/pci/isp2400_input_system_local.h +0 -2
index 6880c9b6aa65..c3ae5014a039 100644
@@ -29,8 +29,6 @@
 #include "isp_acquisition_defs.h"
 #include "input_system_ctrl_defs.h"
 
-typedef struct input_system_cfg2400_s		input_system_cfg2400_t;
-
 struct target_cfg2400_s {
 	input_switch_cfg_channel_t		input_switch_channel_cfg;
 	target_isp_cfg_t	target_isp_cfg;

base-commit: 68b9bcc8a534cd11fe55f8bc82f948aae7d81b3c

Signature · 1 line
2.34.1