diff options
| author | Nathan Chancellor <nathan@kernel.org> | 2021-12-27 17:42:43 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@kernel.org> | 2022-01-10 15:54:13 +0100 |
| commit | a89eeb9937a0124e609e9355cd48cdfe35c8b8b7 (patch) | |
| tree | 2381cec7419275453850c146d2b8e97ec1c93a13 | |
| parent | 68b9bcc8a534cd11fe55f8bc82f948aae7d81b3c (diff) | |
| download | linux-a89eeb9937a0124e609e9355cd48cdfe35c8b8b7.tar.gz linux-a89eeb9937a0124e609e9355cd48cdfe35c8b8b7.tar.bz2 linux-a89eeb9937a0124e609e9355cd48cdfe35c8b8b7.zip | |
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>
| -rw-r--r-- | drivers/staging/media/atomisp/pci/isp2400_input_system_local.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/staging/media/atomisp/pci/isp2400_input_system_local.h b/drivers/staging/media/atomisp/pci/isp2400_input_system_local.h index 6880c9b6aa65..c3ae5014a039 100644 --- a/drivers/staging/media/atomisp/pci/isp2400_input_system_local.h +++ b/drivers/staging/media/atomisp/pci/isp2400_input_system_local.h @@ -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; |