media: atomisp: isp_const.h: get rid of an unused big define list

None of those SH_CSS_BINARY_ID_* symbols are used by this driver
anymore. So, get rid of all of them.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

2 files changed, 0 insertions, 286 deletions

diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/modes/interface/isp_const.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/modes/interface/isp_const.h
index b9a00894d348..698e6438f36e 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/modes/interface/isp_const.h
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/modes/interface/isp_const.h
@@ -43,291 +43,6 @@ more details.
 
 #define UNION struct /* Union constructors not allowed in C++ */
 
-/* ISP binary identifiers.
-   These determine the order in which the binaries are looked up, do not change
-   this!
-   Also, the SP firmware uses this same order (isp_loader.hive.c).
-   Also, gen_firmware.c uses this order in its firmware_header.
-*/
-/* The binary id is used in pre-processor expressions so we cannot
- * use an enum here. */
-/* 24xx pipelines*/
-#define SH_CSS_BINARY_ID_COPY                      0
-#define SH_CSS_BINARY_ID_BAYER_DS                  1
-#define SH_CSS_BINARY_ID_VF_PP_FULL                2
-#define SH_CSS_BINARY_ID_VF_PP_OPT                 3
-#define SH_CSS_BINARY_ID_YUV_SCALE                 4
-#define SH_CSS_BINARY_ID_CAPTURE_PP                5
-#define SH_CSS_BINARY_ID_PRE_ISP                   6
-#define SH_CSS_BINARY_ID_PRE_ISP_ISP2              7
-#define SH_CSS_BINARY_ID_GDC                       8
-#define SH_CSS_BINARY_ID_POST_ISP                  9
-#define SH_CSS_BINARY_ID_POST_ISP_ISP2            10
-#define SH_CSS_BINARY_ID_ANR                      11
-#define SH_CSS_BINARY_ID_ANR_ISP2                 12
-#define SH_CSS_BINARY_ID_PREVIEW_CONT_DS          13
-#define SH_CSS_BINARY_ID_PREVIEW_DS               14
-#define SH_CSS_BINARY_ID_PREVIEW_DEC              15
-#define SH_CSS_BINARY_ID_PREVIEW_CONT_BDS125_ISP2 16
-#define SH_CSS_BINARY_ID_PREVIEW_CONT_DPC_BDS150_ISP2 17
-#define SH_CSS_BINARY_ID_PREVIEW_CONT_BDS150_ISP2 18
-#define SH_CSS_BINARY_ID_PREVIEW_CONT_DPC_BDS200_ISP2 19
-#define SH_CSS_BINARY_ID_PREVIEW_CONT_BDS200_ISP2 20
-#define SH_CSS_BINARY_ID_PREVIEW_DZ               21
-#define SH_CSS_BINARY_ID_PREVIEW_DZ_ISP2          22
-#define SH_CSS_BINARY_ID_PRIMARY_DS               23
-#define SH_CSS_BINARY_ID_PRIMARY_VAR              24
-#define SH_CSS_BINARY_ID_PRIMARY_VAR_ISP2         25
-#define SH_CSS_BINARY_ID_PRIMARY_SMALL            26
-#define SH_CSS_BINARY_ID_PRIMARY_STRIPED          27
-#define SH_CSS_BINARY_ID_PRIMARY_STRIPED_ISP2     28
-#define SH_CSS_BINARY_ID_PRIMARY_8MP              29
-#define SH_CSS_BINARY_ID_PRIMARY_14MP             30
-#define SH_CSS_BINARY_ID_PRIMARY_16MP             31
-#define SH_CSS_BINARY_ID_PRIMARY_REF              32
-#define SH_CSS_BINARY_ID_PRIMARY_ISP261_STAGE0        33
-#define SH_CSS_BINARY_ID_PRIMARY_ISP261_STAGE1        34
-#define SH_CSS_BINARY_ID_PRIMARY_ISP261_STAGE2        35
-#define SH_CSS_BINARY_ID_PRIMARY_ISP261_STAGE3        36
-#define SH_CSS_BINARY_ID_PRIMARY_ISP261_STAGE4        37
-#define SH_CSS_BINARY_ID_PRIMARY_ISP261_STAGE5        38
-#define SH_CSS_BINARY_ID_VIDEO_OFFLINE            39
-#define SH_CSS_BINARY_ID_VIDEO_DS                 40
-#define SH_CSS_BINARY_ID_VIDEO_YUV_DS             41
-#define SH_CSS_BINARY_ID_VIDEO_DZ                 42
-#define SH_CSS_BINARY_ID_VIDEO_DZ_2400_ONLY       43
-#define SH_CSS_BINARY_ID_VIDEO_HIGH               44
-#define SH_CSS_BINARY_ID_VIDEO_NODZ               45
-#define SH_CSS_BINARY_ID_VIDEO_CONT_MULTIBDS_ISP2_MIN 46
-#define SH_CSS_BINARY_ID_VIDEO_CONT_BDS_300_600_ISP2_MIN 47
-#define SH_CSS_BINARY_ID_VIDEO_CONT_DPC_BDS150_ISP2_MIN 48
-#define SH_CSS_BINARY_ID_VIDEO_CONT_BDS150_ISP2_MIN   49
-#define SH_CSS_BINARY_ID_VIDEO_CONT_DPC_BDS200_ISP2_MIN   50
-#define SH_CSS_BINARY_ID_VIDEO_CONT_BDS200_ISP2_MIN   51
-#define SH_CSS_BINARY_ID_VIDEO_CONT_NOBDS_ISP2_MIN    52
-#define SH_CSS_BINARY_ID_VIDEO_DZ_ISP2_MIN      53
-#define SH_CSS_BINARY_ID_VIDEO_DZ_ISP2          54
-#define SH_CSS_BINARY_ID_VIDEO_LP_ISP2          55
-#define SH_CSS_BINARY_ID_RESERVED1              56
-#define SH_CSS_BINARY_ID_ACCELERATION           57
-#define SH_CSS_BINARY_ID_PRE_DE_ISP2            58
-#define SH_CSS_BINARY_ID_KERNEL_TEST_LOAD_STORE 59
-#define SH_CSS_BINARY_ID_CAPTURE_PP_BLI         60
-#define SH_CSS_BINARY_ID_CAPTURE_PP_LDC         61
-#ifdef ISP2401
-#define SH_CSS_BINARY_ID_PRIMARY_STRIPED_ISP2_XNR      62
-#endif
-
-/* skycam kerneltest pipelines */
-#ifndef ISP2401
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_NORM              120
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_NORM_STRIPED      121
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_LIN               122
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_LIN_STRIPED       123
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_ACC_SHD           124
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_ACC_SHD_STRIPED   125
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_ACC_AWB           126
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_3A                127
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_3A_STRIPED        128
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_ACC_AF            129
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_OBGRID            130
-#define SH_CSS_BINARY_ID_VIDEO_TEST_ACC_BAYER_DENOISE       131
-#define SH_CSS_BINARY_ID_VIDEO_TEST_ACC_BAYER_DENOISE_STRIPED 132
-#define SH_CSS_BINARY_ID_VIDEO_TEST_ACC_DEMOSAIC            133
-#define SH_CSS_BINARY_ID_VIDEO_TEST_ACC_YUVP1_C0            134
-#define SH_CSS_BINARY_ID_VIDEO_TEST_ACC_YUVP2               135
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_REF               136
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_REF_STRIPED       137
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_XNR_REF           138
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_DVS               139
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_XNR               140
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_XNR_STRIPED       141
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_XNR_BLENDING      142
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_TNR_BLOCK         143
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_ACC_AE            144
-#define SH_CSS_BINARY_ID_VIDEO_RAW                          145
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_ACC_AWB_FR        146
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_DM_RGBPP          147
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_DM_RGBPP_STRIPED  148
-#define SH_CSS_BINARY_ID_VIDEO_TEST_ACC_ANR                 149
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_IF                150
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_IF_STRIPED        151
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_OUTPUT_SYSTEM     152
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_TNR_STRIPED       153
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_DVS_STRIPED       154
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_OBGRID_STRIPED    155
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_COPY_YUV          156
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_COPY_YUV_BLOCK    157
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_COPY_YUV16_BLOCK  158
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_COPY_YUV16_STRIPED 159
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_COPY_BLOCK_STRIPED 160
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_INPUT_YUV         161
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_OUTPUT_YUV        162
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_OUTPUT_YUV_16     163
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_OUTPUT_SPLIT      164
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_OUTPUT_SYSTEM_STRIPED 165
-
-#else
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_NORM              121
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_NORM_STRIPED      122
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_OBGRID            123
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_OBGRID_STRIPED    124
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_LIN               125
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_LIN_STRIPED       126
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_ACC_SHD           127
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_ACC_SHD_STRIPED   128
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_ACC_AE            129
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_ACC_AWB           130
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_ACC_AF            131
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_ACC_AWB_FR        132
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_3A                133
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_3A_STRIPED        134
-#define SH_CSS_BINARY_ID_VIDEO_TEST_ACC_BAYER_DENOISE       135
-#define SH_CSS_BINARY_ID_VIDEO_TEST_ACC_BAYER_DENOISE_STRIPED 136
-#define SH_CSS_BINARY_ID_VIDEO_TEST_ACC_ANR                 137
-#define SH_CSS_BINARY_ID_VIDEO_TEST_ACC_ANR_STRIPED         138
-#define SH_CSS_BINARY_ID_VIDEO_TEST_ACC_DEMOSAIC            139
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_DM_RGBPP          140
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_DM_RGBPP_STRIPED  141
-#define SH_CSS_BINARY_ID_VIDEO_TEST_ACC_YUVP1_C0            142
-#define SH_CSS_BINARY_ID_VIDEO_TEST_ACC_YUVP2               143
-#define SH_CSS_BINARY_ID_VIDEO_TEST_ACC_YUVP2_STRIPED       144
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_XNR_REF           145
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_XNR               146
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_XNR_STRIPED       147
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_XNR_BLENDING      148
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_REF               149
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_REF_STRIPED       150
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_DVS               151
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_DVS_STRIPED       152
-#define SH_CSS_BINARY_ID_VIDEO_TEST_ACC_DVS_STAT_C0         153
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_TNR_BLOCK         154
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_TNR_STRIPED       155
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_OUTPUT_SYSTEM     156
-#define SH_CSS_BINARY_ID_VIDEO_RAW                          157
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_COPY_YUV          158
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_COPY_YUV_BLOCK    159
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_COPY_YUV16_BLOCK  160
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_COPY_YUV16_STRIPED 161
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_COPY_BLOCK_STRIPED 162
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_INPUT_YUV         163
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_OUTPUT_YUV        164
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_OUTPUT_YUV_16     165
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_OUTPUT_SPLIT      166
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_OUTPUT_SYSTEM_STRIPED 167
-#define SH_CSS_BINARY_ID_COPY_KERNELTEST_OUTPUT_SYSTEM      168
-#endif
-
-/* skycam partial test pipelines*/
-#ifndef ISP2401
-#define SH_CSS_BINARY_ID_IF_TO_DPC                          201
-#define SH_CSS_BINARY_ID_IF_TO_BDS                          202
-#else
-#define SH_CSS_BINARY_ID_IF_TO_BDS                          201
-#define SH_CSS_BINARY_ID_IF_TO_BDS_STRIPED                  202
-#endif
-#define SH_CSS_BINARY_ID_IF_TO_NORM                         203
-#ifndef ISP2401
-#define SH_CSS_BINARY_ID_IF_TO_OB                           204
-#define SH_CSS_BINARY_ID_IF_TO_LIN                          205
-#define SH_CSS_BINARY_ID_IF_TO_SHD                          206
-#define SH_CSS_BINARY_ID_IF_TO_BNR                          207
-#define SH_CSS_BINARY_ID_IF_TO_RGBPP_NV12_16                208
-#define SH_CSS_BINARY_ID_IF_TO_RGBPP                        210
-#define SH_CSS_BINARY_ID_IF_TO_YUVP1                        211
-#define SH_CSS_BINARY_ID_IF_TO_DM                           214
-#define SH_CSS_BINARY_ID_IF_TO_YUVP2_C0                     216
-#define SH_CSS_BINARY_ID_IF_TO_YUVP2_ANR_VIA_ISP            217
-#define SH_CSS_BINARY_ID_VIDEO_IF_TO_DVS                    218
-#define SH_CSS_BINARY_ID_VIDEO_IF_TO_TNR                    219
-#define SH_CSS_BINARY_ID_IF_TO_BDS_STRIPED                  224
-#define SH_CSS_BINARY_ID_VIDEO_TEST_ACC_ANR_STRIPED         225
-#define SH_CSS_BINARY_ID_VIDEO_TEST_ACC_YUVP2_STRIPED       227
-#define SH_CSS_BINARY_ID_IF_TO_BDS_RGBP_DVS_STAT_C0         228
-#define SH_CSS_BINARY_ID_IF_TO_BDS_RGBP_DVS_STAT_C0_STRIPED 229
-#define SH_CSS_BINARY_ID_IF_TO_REF                          236
-#define SH_CSS_BINARY_ID_IF_TO_DVS_STRIPED                  237
-#define SH_CSS_BINARY_ID_IF_TO_YUVP2_STRIPED                238
-#define SH_CSS_BINARY_ID_IF_TO_YUVP1_STRIPED                239
-#define SH_CSS_BINARY_ID_IF_TO_RGBPP_STRIPED                240
-#define SH_CSS_BINARY_ID_IF_TO_ANR_STRIPED                  241
-#define SH_CSS_BINARY_ID_IF_TO_BNR_STRIPED                  242
-#define SH_CSS_BINARY_ID_IF_TO_SHD_STRIPED                  243
-#define SH_CSS_BINARY_ID_IF_TO_LIN_STRIPED                  244
-#define SH_CSS_BINARY_ID_IF_TO_OB_STRIPED                   245
-#define SH_CSS_BINARY_ID_IF_TO_NORM_STRIPED                 248
-#define SH_CSS_BINARY_ID_COPY_KERNELTEST_OUTPUT_SYSTEM      253
-#define SH_CSS_BINARY_ID_IF_TO_XNR                          256
-#define SH_CSS_BINARY_ID_IF_TO_XNR_STRIPED                  257
-#define SH_CSS_BINARY_ID_IF_TO_REF_STRIPED                  258
-#define SH_CSS_BINARY_ID_VIDEO_IF_TO_OSYS                   259
-#define SH_CSS_BINARY_ID_IF_TO_YUVP1_C0                     262
-#define SH_CSS_BINARY_ID_IF_TO_XNR_PRIMARY                  263
-#define SH_CSS_BINARY_ID_IF_TO_XNR_PRIMARY_STRIPED          264
-#define SH_CSS_BINARY_ID_IF_TO_ANR                          265
-#define SH_CSS_BINARY_ID_VIDEO_TEST_ACC_DVS_STAT_C0         266
-#define SH_CSS_BINARY_ID_VIDEO_IF_TO_OSYS_STRIPED           270
-#define SH_CSS_BINARY_ID_IF_TO_OSYS_PRIMARY                 276
-#define SH_CSS_BINARY_ID_IF_TO_OSYS_PRIMARY_STRIPED         277
-#define SH_CSS_BINARY_ID_IF_TO_YUVP1_C0_STRIPED             278
-#else
-#define SH_CSS_BINARY_ID_IF_TO_NORM_STRIPED                 204
-#define SH_CSS_BINARY_ID_IF_TO_OB                           205
-#define SH_CSS_BINARY_ID_IF_TO_OB_STRIPED                   206
-#define SH_CSS_BINARY_ID_IF_TO_LIN                          207
-#define SH_CSS_BINARY_ID_IF_TO_LIN_STRIPED                  208
-#define SH_CSS_BINARY_ID_IF_TO_SHD                          209
-#define SH_CSS_BINARY_ID_IF_TO_SHD_STRIPED                  210
-#define SH_CSS_BINARY_ID_IF_TO_BNR                          211
-#define SH_CSS_BINARY_ID_IF_TO_BNR_STRIPED                  212
-#define SH_CSS_BINARY_ID_IF_TO_ANR                          213
-#define SH_CSS_BINARY_ID_IF_TO_ANR_STRIPED                  214
-#define SH_CSS_BINARY_ID_IF_TO_DM                           215
-#define SH_CSS_BINARY_ID_IF_TO_BDS_RGBP_DVS_STAT_C0         216
-#define SH_CSS_BINARY_ID_IF_TO_BDS_RGBP_DVS_STAT_C0_STRIPED 217
-#define SH_CSS_BINARY_ID_IF_TO_RGBPP                        218
-#define SH_CSS_BINARY_ID_IF_TO_RGBPP_NV12_16                219
-#define SH_CSS_BINARY_ID_IF_TO_RGBPP_STRIPED                220
-#define SH_CSS_BINARY_ID_IF_TO_YUVP1                        221
-#define SH_CSS_BINARY_ID_IF_TO_YUVP1_STRIPED                222
-#define SH_CSS_BINARY_ID_IF_TO_YUVP1_C0                     223
-#define SH_CSS_BINARY_ID_IF_TO_YUVP2_C0                     224
-#define SH_CSS_BINARY_ID_IF_TO_YUVP2_STRIPED                225
-#define SH_CSS_BINARY_ID_IF_TO_XNR                          226
-#define SH_CSS_BINARY_ID_IF_TO_XNR_STRIPED                  227
-#define SH_CSS_BINARY_ID_IF_TO_XNR_PRIMARY                  228
-#define SH_CSS_BINARY_ID_IF_TO_XNR_PRIMARY_STRIPED          229
-#define SH_CSS_BINARY_ID_IF_TO_REF                          230
-#define SH_CSS_BINARY_ID_IF_TO_REF_STRIPED                  231
-#define SH_CSS_BINARY_ID_VIDEO_IF_TO_DVS                    232
-#define SH_CSS_BINARY_ID_IF_TO_DVS_STRIPED                  233
-#define SH_CSS_BINARY_ID_VIDEO_IF_TO_TNR                    234
-#define SH_CSS_BINARY_ID_VIDEO_IF_TO_OSYS                   235
-#define SH_CSS_BINARY_ID_VIDEO_IF_TO_OSYS_STRIPED           236
-#define SH_CSS_BINARY_ID_IF_TO_OSYS_PRIMARY                 237
-#define SH_CSS_BINARY_ID_IF_TO_OSYS_PRIMARY_STRIPED         238
-#define SH_CSS_BINARY_ID_IF_TO_YUVP1_C0_STRIPED             239
-#define SH_CSS_BINARY_ID_VIDEO_YUVP1_TO_OSYS                240
-#define SH_CSS_BINARY_ID_IF_TO_OSYS_PREVIEW                 241
-#define SH_CSS_BINARY_ID_IF_TO_OSYS_PREVIEW_STRIPED         242
-#endif
-
-/* Skycam IR camera binaries */
-#ifndef ISP2401
-#define SH_CSS_BINARY_ID_IR_IF_TO_OSYS_NO_XNR               300
-#define SH_CSS_BINARY_ID_VIDEO_IR_IF_TO_OSYS_NO_DVS_NO_TNR_NO_XNR    301
-#define SH_CSS_BINARY_ID_IR_IF_TO_OSYS_NO_XNR_NO_DVS_PRIMARY         302
-#else
-#define SH_CSS_BINARY_ID_IR_IF_TO_OSYS                      300
-#define SH_CSS_BINARY_ID_IR_IF_TO_OSYS_NO_TNR3              301
-#define SH_CSS_BINARY_ID_IR_IF_TO_OSYS_PRIMARY              302
-
-/* Binaries under development */
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_TNR3              401
-#define SH_CSS_BINARY_ID_VIDEO_KERNELTEST_TNR3_STRIPED      402
-
-#endif
-
 #define XMEM_WIDTH_BITS              HIVE_ISP_DDR_WORD_BITS
 #define XMEM_SHORTS_PER_WORD         (HIVE_ISP_DDR_WORD_BITS / 16)
 #define XMEM_INTS_PER_WORD           (HIVE_ISP_DDR_WORD_BITS / 32)
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c
index 7c0216533e66..b0b8c2c4a227 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c
@@ -47,7 +47,6 @@ struct fw_param {
 	const void *buffer;
 };
 
-/* Warning: same order as SH_CSS_BINARY_ID_* */
 static struct firmware_header *firmware_header;
 
 /* The string STR is a place holder