media: atomisp: get rid of trivial ISP2401 dependencies on header files

On several header files, the dependency for ISP2401 is
trivial: for example, it just adds new fields on structs or
declare new functions.

Get rid of those trivial cases.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_configs.h

@@ -22,9 +22,9 @@
 #include "isp/kernels/raw/raw_1.0/ia_css_raw.host.h"
 #include "isp/kernels/ref/ref_1.0/ia_css_ref.host.h"
 #include "isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.h"
-#ifdef ISP2401
+/* ISP2401 */
 #include "isp/kernels/sc/sc_1.0/ia_css_sc.host.h"
-#endif
+
 #include "isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.h"
 #include "isp/kernels/vf/vf_1.0/ia_css_vf.host.h"
 #include "isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.h"
@@ -47,13 +47,14 @@ enum ia_css_configuration_ids {
 	IA_CSS_OUTPUT0_CONFIG_ID,
 	IA_CSS_OUTPUT1_CONFIG_ID,
 	IA_CSS_OUTPUT_CONFIG_ID,
-#ifdef ISP2401
-	IA_CSS_SC_CONFIG_ID,
-#endif
 	IA_CSS_RAW_CONFIG_ID,
 	IA_CSS_TNR_CONFIG_ID,
 	IA_CSS_REF_CONFIG_ID,
 	IA_CSS_VF_CONFIG_ID,
+
+	/* ISP2401 */
+	IA_CSS_SC_CONFIG_ID,
+
 	IA_CSS_NUM_CONFIGURATION_IDS
 };
 
@@ -70,9 +71,10 @@ struct ia_css_config_memory_offsets {
 		struct ia_css_isp_parameter output0;
 		struct ia_css_isp_parameter output1;
 		struct ia_css_isp_parameter output;
-#ifdef ISP2401
+
+		/* ISP2401 */
 		struct ia_css_isp_parameter sc;
-#endif
+
 		struct ia_css_isp_parameter raw;
 		struct ia_css_isp_parameter tnr;
 		struct ia_css_isp_parameter ref;
@@ -149,7 +151,7 @@ ia_css_configure_output(
 
 /* Code generated by genparam/genconfig.c:gen_configure_function() */
 
-#ifdef ISP2401
+/* ISP2401 */
 void
 ia_css_configure_sc(
     const struct ia_css_binary *binary,
@@ -157,7 +159,6 @@ ia_css_configure_sc(
 
 /* Code generated by genparam/genconfig.c:gen_configure_function() */
 
-#endif
 void
 ia_css_configure_raw(
     const struct ia_css_binary *binary,

drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_params.h

@@ -120,9 +120,9 @@ struct ia_css_memory_offsets {
 		struct ia_css_isp_parameter sdis_vertcoef;
 		struct ia_css_isp_parameter sdis2_horicoef;
 		struct ia_css_isp_parameter sdis2_vertcoef;
-#ifdef ISP2401
+
+		/* ISP2401 */
 		struct ia_css_isp_parameter xnr3;
-#endif
 	} vmem;
 	struct {
 		struct ia_css_isp_parameter bh;
@@ -382,18 +382,13 @@ void
 ia_css_get_configs(struct ia_css_isp_parameters *params,
 		   const struct ia_css_isp_config *config)
 ;
-#ifdef ISP2401
 
-#endif
 /* Code generated by genparam/gencode.c:gen_global_access_function() */
 
 void
 ia_css_set_configs(struct ia_css_isp_parameters *params,
 		   const struct ia_css_isp_config *config)
 ;
-#ifdef ISP2401
-
-#endif
 #endif /* IA_CSS_INCLUDE_PARAMETER */
 
 #endif /* _IA_CSS_ISP_PARAM_H */

drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_configs.h

@@ -22,9 +22,10 @@
 #include "isp/kernels/raw/raw_1.0/ia_css_raw.host.h"
 #include "isp/kernels/ref/ref_1.0/ia_css_ref.host.h"
 #include "isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.h"
-#ifdef ISP2401
+
+/* ISP2401 */
 #include "isp/kernels/sc/sc_1.0/ia_css_sc.host.h"
-#endif
+
 #include "isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.h"
 #include "isp/kernels/vf/vf_1.0/ia_css_vf.host.h"
 #include "isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.h"
@@ -47,13 +48,14 @@ enum ia_css_configuration_ids {
 	IA_CSS_OUTPUT0_CONFIG_ID,
 	IA_CSS_OUTPUT1_CONFIG_ID,
 	IA_CSS_OUTPUT_CONFIG_ID,
-#ifdef ISP2401
-	IA_CSS_SC_CONFIG_ID,
-#endif
 	IA_CSS_RAW_CONFIG_ID,
 	IA_CSS_TNR_CONFIG_ID,
 	IA_CSS_REF_CONFIG_ID,
 	IA_CSS_VF_CONFIG_ID,
+
+	/* ISP 2401 */
+	IA_CSS_SC_CONFIG_ID,
+
 	IA_CSS_NUM_CONFIGURATION_IDS
 };
 
@@ -70,9 +72,10 @@ struct ia_css_config_memory_offsets {
 		struct ia_css_isp_parameter output0;
 		struct ia_css_isp_parameter output1;
 		struct ia_css_isp_parameter output;
-#ifdef ISP2401
+
+		/* ISP2401 */
 		struct ia_css_isp_parameter sc;
-#endif
+
 		struct ia_css_isp_parameter raw;
 		struct ia_css_isp_parameter tnr;
 		struct ia_css_isp_parameter ref;
@@ -149,7 +152,7 @@ ia_css_configure_output(
 
 /* Code generated by genparam/genconfig.c:gen_configure_function() */
 
-#ifdef ISP2401
+/* ISP2401 */
 void
 ia_css_configure_sc(
     const struct ia_css_binary *binary,
@@ -157,7 +160,6 @@ ia_css_configure_sc(
 
 /* Code generated by genparam/genconfig.c:gen_configure_function() */
 
-#endif
 void
 ia_css_configure_raw(
     const struct ia_css_binary *binary,

drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_params.h

@@ -120,9 +120,9 @@ struct ia_css_memory_offsets {
 		struct ia_css_isp_parameter sdis_vertcoef;
 		struct ia_css_isp_parameter sdis2_horicoef;
 		struct ia_css_isp_parameter sdis2_vertcoef;
-#ifdef ISP2401
+
+		/* ISP2401 */
 		struct ia_css_isp_parameter xnr3;
-#endif
 	} vmem;
 	struct {
 		struct ia_css_isp_parameter bh;
@@ -382,18 +382,13 @@ void
 ia_css_get_configs(struct ia_css_isp_parameters *params,
 		   const struct ia_css_isp_config *config)
 ;
-#ifdef ISP2401
 
-#endif
 /* Code generated by genparam/gencode.c:gen_global_access_function() */
 
 void
 ia_css_set_configs(struct ia_css_isp_parameters *params,
 		   const struct ia_css_isp_config *config)
 ;
-#ifdef ISP2401
 
-#endif
 #endif /* IA_CSS_INCLUDE_PARAMETER */
-
 #endif /* _IA_CSS_ISP_PARAM_H */

drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_configs.h

@@ -22,9 +22,10 @@
 #include "isp/kernels/raw/raw_1.0/ia_css_raw.host.h"
 #include "isp/kernels/ref/ref_1.0/ia_css_ref.host.h"
 #include "isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.h"
-#ifdef ISP2401
+
+/* ISP2401 */
 #include "isp/kernels/sc/sc_1.0/ia_css_sc.host.h"
-#endif
+
 #include "isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.h"
 #include "isp/kernels/vf/vf_1.0/ia_css_vf.host.h"
 #include "isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.h"
@@ -47,13 +48,14 @@ enum ia_css_configuration_ids {
 	IA_CSS_OUTPUT0_CONFIG_ID,
 	IA_CSS_OUTPUT1_CONFIG_ID,
 	IA_CSS_OUTPUT_CONFIG_ID,
-#ifdef ISP2401
-	IA_CSS_SC_CONFIG_ID,
-#endif
 	IA_CSS_RAW_CONFIG_ID,
 	IA_CSS_TNR_CONFIG_ID,
 	IA_CSS_REF_CONFIG_ID,
 	IA_CSS_VF_CONFIG_ID,
+
+	/* ISP2401 */
+	IA_CSS_SC_CONFIG_ID,
+
 	IA_CSS_NUM_CONFIGURATION_IDS
 };
 
@@ -149,7 +151,7 @@ ia_css_configure_output(
 
 /* Code generated by genparam/genconfig.c:gen_configure_function() */
 
-#ifdef ISP2401
+/* ISP2401 */
 void
 ia_css_configure_sc(
     const struct ia_css_binary *binary,
@@ -157,7 +159,6 @@ ia_css_configure_sc(
 
 /* Code generated by genparam/genconfig.c:gen_configure_function() */
 
-#endif
 void
 ia_css_configure_raw(
     const struct ia_css_binary *binary,

drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_params.h

@@ -120,9 +120,9 @@ struct ia_css_memory_offsets {
 		struct ia_css_isp_parameter sdis_vertcoef;
 		struct ia_css_isp_parameter sdis2_horicoef;
 		struct ia_css_isp_parameter sdis2_vertcoef;
-#ifdef ISP2401
+
+		/* ISP2401 */
 		struct ia_css_isp_parameter xnr3;
-#endif
 	} vmem;
 	struct {
 		struct ia_css_isp_parameter bh;
@@ -382,18 +382,13 @@ void
 ia_css_get_configs(struct ia_css_isp_parameters *params,
 		   const struct ia_css_isp_config *config)
 ;
-#ifdef ISP2401
 
-#endif
 /* Code generated by genparam/gencode.c:gen_global_access_function() */
 
 void
 ia_css_set_configs(struct ia_css_isp_parameters *params,
 		   const struct ia_css_isp_config *config)
 ;
-#ifdef ISP2401
 
-#endif
 #endif /* IA_CSS_INCLUDE_PARAMETER */
-
 #endif /* _IA_CSS_ISP_PARAM_H */

drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/isp_global.h

@@ -35,7 +35,6 @@
 #define ISP_NWAY_LOG2			6
 #define ISP_VEC_NELEMS_LOG2		ISP_NWAY_LOG2
 
-#ifdef ISP2401
 #ifdef PIPE_GENERATION
 #define PIPEMEM(x) MEM(x)
 #define ISP_NWAY   BIT(ISP_NWAY_LOG2)
@@ -43,7 +42,6 @@
 #define PIPEMEM(x)
 #endif
 
-#endif
 /* The number of data bytes in a vector disregarding the reduced precision */
 #define ISP_VEC_BYTES			(ISP_VEC_NELEMS * sizeof(uint16_t))
 
@@ -99,17 +97,14 @@
 #define ISP_VAMEM3_SINK_REG		0x08
 #define ISP_HMEM_SINK_REG		0x08
 
-#ifdef ISP2401
+/* ISP2401 */
 #define ISP_BAMEM_ALIGN_ELEM ISP_VMEM_ALIGN_ELEM
 #define BAMEM VMEM
-
 #define XNR3_DOWN_BAMEM_BASE_ADDRESS    (0x16880)
 #define XNR3_UP_BAMEM_BASE_ADDRESS      (0x12880)
-
 #define bmem_ldrow(fu, pid, offset, data) bmem_ldrow_s(fu, pid, offset, data)
 #define bmem_strow(fu, pid, offset, data) bmem_strow_s(fu, pid, offset, data)
 #define bmem_ldblk(fu, pid, offset, data) bmem_ldblk_s(fu, pid, offset, data)
 #define bmem_stblk(fu, pid, offset, data) bmem_stblk_s(fu, pid, offset, data)
 
-#endif
 #endif /* __ISP_GLOBAL_H_INCLUDED__ */

drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/device_access/device_access.h

-#ifndef ISP2401
-/*
- * Support for Intel Camera Imaging ISP subsystem.
- * Copyright (c) 2015, Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- */
-#else
 /**
 Support for Intel Camera Imaging ISP subsystem.
 Copyright (c) 2010 - 2015, Intel Corporation.
@@ -26,7 +11,6 @@ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
 more details.
 */
-#endif
 
 #ifndef __DEVICE_ACCESS_H_INCLUDED__
 #define __DEVICE_ACCESS_H_INCLUDED__

drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/math_support.h

@@ -23,11 +23,10 @@
 /* force a value to a lower even value */
 #define EVEN_FLOOR(x)        ((x) & ~1)
 
-#ifdef ISP2401
+/* ISP2401 */
 /* If the number is odd, find the next even number */
 #define EVEN_CEIL(x)         ((IS_ODD(x)) ? ((x) + 1) : (x))
 
-#endif
 /* A => B */
 #define IMPLIES(a, b)        (!(a) || (b))
 
@@ -93,17 +92,17 @@ static inline unsigned int ceil_shift_mul(unsigned int a, unsigned int b)
 	return CEIL_SHIFT_MUL(a, b);
 }
 
-#ifdef ISP2401
+/* ISP2401 */
 static inline unsigned int round_half_down_div(unsigned int a, unsigned int b)
 {
 	return ROUND_HALF_DOWN_DIV(a, b);
 }
 
+/* ISP2401 */
 static inline unsigned int round_half_down_mul(unsigned int a, unsigned int b)
 {
 	return ROUND_HALF_DOWN_MUL(a, b);
 }
-#endif
 
 /* @brief Next Power of Two
  *

drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_acc_types.h

@@ -221,11 +221,11 @@ struct ia_css_binary_info {
 	struct ia_css_isp_param_isp_segments	mem_initializers;
 	/* MW: Packing (related) bools in an integer ?? */
 	struct {
-#ifdef ISP2401
+		/* ISP2401 */
 		u8	luma_only;
 		u8	input_yuv;
 		u8	input_raw;
-#endif
+
 		u8	reduced_pipe;
 		u8	vf_veceven;
 		u8	dis;
@@ -326,9 +326,10 @@ struct ia_css_sp_info {
 	u32 host_sp_queues_initialized; /** Polled from the SP */
 	u32 sleep_mode;  /** different mode to halt SP */
 	u32 invalidate_tlb;		/** inform SP to invalidate mmu TLB */
-#ifndef ISP2401
+
+	/* ISP2400 */
 	u32 stop_copy_preview;       /** suspend copy and preview pipe when capture */
-#endif
+
 	u32 debug_buffer_ddr_address;	/** inform SP the address
 	of DDR debug queue */
 	u32 perf_counter_input_system_error; /** input system perf

drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe_public.h

@@ -24,9 +24,8 @@
 #include <ia_css_types.h>
 #include <ia_css_frame_public.h>
 #include <ia_css_buffer.h>
-#ifdef ISP2401
+/* ISP2401 */
 #include <ia_css_acc_types.h>
-#endif
 
 enum {
 	IA_CSS_PIPE_OUTPUT_STAGE_0 = 0,
@@ -484,7 +483,7 @@ ia_css_pipe_get_qos_ext_state(struct ia_css_pipe *pipe,
 			      u32 fw_handle,
 			      bool *enable);
 
-#ifdef ISP2401
+/* ISP2401  */
 /* @brief  Update mapped CSS and ISP arguments for QoS pipe during SP runtime.
  * @param[in] pipe	Pipe handle.
  * @param[in] fw_handle	Extension firmware Handle (ia_css_fw_info.handle).
@@ -507,7 +506,6 @@ ia_css_pipe_update_qos_ext_mapped_arg(struct ia_css_pipe *pipe,
 				      struct ia_css_isp_param_css_segments *css_seg,
 				      struct ia_css_isp_param_isp_segments *isp_seg);
 
-#endif
 /* @brief Get selected configuration settings
  * @param[in]	pipe	The pipe.
  * @param[out]	config	Configuration settings.
@@ -543,7 +541,7 @@ ia_css_pipe_set_bci_scaler_lut(struct ia_css_pipe *pipe,
  */
 bool ia_css_pipe_has_dvs_stats(struct ia_css_pipe_info *pipe_info);
 
-#ifdef ISP2401
+/* ISP2401 */
 /* @brief Override the frameformat set on the output pins.
  * @param[in]  pipe        Pipe handle.
  * @param[in]  output_pin  Pin index to set the format on
@@ -568,5 +566,4 @@ ia_css_pipe_override_frame_format(struct ia_css_pipe *pipe,
 				  int output_pin,
 				  enum ia_css_frame_format format);
 
-#endif
 #endif /* __IA_CSS_PIPE_PUBLIC_H */

drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_stream.h

@@ -42,9 +42,9 @@ struct ia_css_stream {
 
 	bool                           cont_capt;
 	bool                           disable_cont_vf;
-#ifndef ISP2401
+
+	/* ISP2401 */
 	bool                           stop_copy_preview;
-#endif
 	bool                           started;
 };
 

drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_stream_public.h

@@ -101,7 +101,6 @@ struct ia_css_stream_config {
 		isys_config[IA_CSS_STREAM_MAX_ISYS_STREAM_PER_CH];
 	struct ia_css_stream_input_config input_config;
 
-#ifdef ISP2401
 	/* Currently, Android and Windows platforms interpret the binning_factor parameter
 	 * differently. In Android, the binning factor is expressed in the form
 	 * 2^N * 2^N, whereas in Windows platform, the binning factor is N*N
@@ -109,7 +108,7 @@ struct ia_css_stream_config {
 	 * macro USE_WINDOWS_BINNING_FACTOR. This is for backward compatibility only
 	 * and will be deprecated. In the future,all platforms will use the N*N method
 	 */
-#endif
+	/* ISP2401 */
 	unsigned int sensor_binning_factor; /** Binning factor used by sensor
 						 to produce image data. This is
 						 used for shading correction. */

drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_timer.h

-#ifndef ISP2401
-/*
- * Support for Intel Camera Imaging ISP subsystem.
- * Copyright (c) 2015, Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- */
-#else
 /**
 Support for Intel Camera Imaging ISP subsystem.
 Copyright (c) 2010 - 2015, Intel Corporation.
@@ -26,7 +11,6 @@ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
 more details.
 */
-#endif
 
 #ifndef __IA_CSS_TIMER_H
 #define __IA_CSS_TIMER_H

drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_types.h

@@ -50,9 +50,10 @@
 #include "isp/kernels/wb/wb_1.0/ia_css_wb_types.h"
 #include "isp/kernels/xnr/xnr_1.0/ia_css_xnr_types.h"
 #include "isp/kernels/xnr/xnr_3.0/ia_css_xnr3_types.h"
-#ifdef ISP2401
+
+/* ISP2401 */
 #include "isp/kernels/tnr/tnr3/ia_css_tnr3_types.h"
-#endif
+
 #include "isp/kernels/ynr/ynr_1.0/ia_css_ynr_types.h"
 #include "isp/kernels/ynr/ynr_2/ia_css_ynr2_types.h"
 #include "isp/kernels/output/output_1.0/ia_css_output_types.h"
@@ -128,12 +129,8 @@ struct ia_css_isp_data {
 
 /* Shading Correction types. */
 enum ia_css_shading_correction_type {
-#ifndef ISP2401
-	IA_CSS_SHADING_CORRECTION_TYPE_1 /** Shading Correction 1.0 (pipe 1.0 on ISP2300, pipe 2.2 on ISP2400) */
-#else
 	IA_CSS_SHADING_CORRECTION_NONE,	 /** Shading Correction is not processed in the pipe. */
 	IA_CSS_SHADING_CORRECTION_TYPE_1 /** Shading Correction 1.0 (pipe 1.0 on ISP2300, pipe 2.2 on ISP2400/2401) */
-#endif
 
 	/** More shading correction types can be added in the future. */
 };
@@ -287,18 +284,11 @@ struct ia_css_shading_info {
 		 *  ISP2: SC1 is used.
 		 */
 		struct {
-#ifndef ISP2401
+			/* ISP2400 */
 			u32 enable;	/** Shading correction enabled.
 						     0:disabled, 1:enabled */
-			u32 num_hor_grids;	/** Number of data points per line
-						     per color on shading table. */
-			u32 num_ver_grids;	/** Number of lines of data points
-						     per color on shading table. */
-			u32 bqs_per_grid_cell; /** Grid cell size
-						in BQ(Bayer Quad) unit.
-						(1BQ means {Gr,R,B,Gb}(2x2 pixels).)
-						Valid values are 8,16,32,64. */
-#else
+
+			/* ISP2401 */
 			u32 num_hor_grids;	/** Number of data points per line per color on shading table. */
 			u32 num_ver_grids;	/** Number of lines of data points per color on shading table. */
 			u32 bqs_per_grid_cell; /** Grid cell size in BQ unit.
@@ -306,46 +296,42 @@ struct ia_css_shading_info {
 							       1BQ means {Gr,R,B,Gb} (2x2 pixels).
 							       Horizontal 1 bqs corresponds to horizontal 2 pixels.
 							       Vertical 1 bqs corresponds to vertical 2 pixels. */
-#endif
 			u32 bayer_scale_hor_ratio_in;
 			u32 bayer_scale_hor_ratio_out;
-#ifndef ISP2401
-			/** Horizontal ratio of bayer scaling
-			between input width and output width, for the scaling
-			which should be done before shading correction.
-			  output_width = input_width * bayer_scale_hor_ratio_out
-						/ bayer_scale_hor_ratio_in */
-#else
+
 			/** Horizontal ratio of bayer scaling between input width and output width,
 			     for the scaling which should be done before shading correction.
 				output_width = input_width * bayer_scale_hor_ratio_out
 								/ bayer_scale_hor_ratio_in + 0.5 */
-#endif
 			u32 bayer_scale_ver_ratio_in;
 			u32 bayer_scale_ver_ratio_out;
-#ifndef ISP2401
+
+
 			/** Vertical ratio of bayer scaling
 			between input height and output height, for the scaling
 			which should be done before shading correction.
 			  output_height = input_height * bayer_scale_ver_ratio_out
 						/ bayer_scale_ver_ratio_in */
+			/* ISP2400 */
 			u32 sc_bayer_origin_x_bqs_on_shading_table;
 			/** X coordinate (in bqs) of bayer origin on shading table.
 			This indicates the left-most pixel of bayer
 			(not include margin) inputted to the shading correction.
 			This corresponds to the left-most pixel of bayer
 			inputted to isp from sensor. */
+			/* ISP2400 */
 			u32 sc_bayer_origin_y_bqs_on_shading_table;
 			/** Y coordinate (in bqs) of bayer origin on shading table.
 			This indicates the top pixel of bayer
 			(not include margin) inputted to the shading correction.
 			This corresponds to the top pixel of bayer
 			inputted to isp from sensor. */
-#else
+
 			/** Vertical ratio of bayer scaling between input height and output height,
 			     for the scaling which should be done before shading correction.
 				output_height = input_height * bayer_scale_ver_ratio_out
 								/ bayer_scale_ver_ratio_in + 0.5 */
+			/* ISP2401 */
 			struct ia_css_resolution isp_input_sensor_data_res_bqs;
 			/** Sensor data size (in bqs) inputted to ISP. This is the size BEFORE bayer scaling.
 			     NOTE: This is NOT the size of the physical sensor size.
@@ -356,13 +342,14 @@ struct ia_css_shading_info {
 				   are applied to the physical sensor data area.
 				   ISP assumes the area of isp_input_sensor_data_res_bqs
 				   is centered on the physical sensor. */
+			/* ISP2401 */
 			struct ia_css_resolution sensor_data_res_bqs;
 			/** Sensor data size (in bqs) at shading correction.
 			     This is the size AFTER bayer scaling. */
+			/* ISP2401 */
 			struct ia_css_coordinate sensor_data_origin_bqs_on_sctbl;
 			/** Origin of sensor data area positioned on shading table at shading correction.
 			     The coordinate x,y should be positive values. */
-#endif
 		} type_1;
 
 		/** More structures can be added here when more shading correction types will be added
@@ -602,10 +589,10 @@ struct ia_css_isp_config {
 	struct ia_css_output_config
 		*output_config;	/** Main Output Mirroring, flipping */
 
-#ifdef ISP2401
+	/* ISP 2401 */
 	struct ia_css_tnr3_kernel_config
 		*tnr3_config;           /** TNR3 config */
-#endif
+
 	struct ia_css_scaler_config
 		*scaler_config;         /** Skylake: scaler config (optional) */
 	struct ia_css_formats_config

drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/conversion/conversion_1.0/ia_css_conversion.host.h

@@ -26,8 +26,4 @@ ia_css_conversion_encode(
     const struct ia_css_conversion_config *from,
     unsigned int size);
 
-#ifdef ISP2401
-/* workaround until code generation in isp_kernelparameters.host.c is fixed */
-#define ia_css_conversion_par_encode(to, from, size) ia_css_conversion_encode(to, from, size)
-#endif
 #endif /* __IA_CSS_CONVERSION_HOST_H */

drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dp/dp_1.0/ia_css_dp.host.h

@@ -19,9 +19,9 @@
 #include "ia_css_dp_param.h"
 
 extern const struct ia_css_dp_config default_dp_config;
-#ifdef ISP2401
+
+/* ISP2401 */
 extern const struct ia_css_dp_config default_dp_10bpp_config;
-#endif
 
 void
 ia_css_dp_encode(

drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dvs/dvs_1.0/ia_css_dvs_param.h

@@ -16,20 +16,13 @@
 #define __IA_CSS_DVS_PARAM_H
 
 #include <type_support.h>
-#ifdef ISP2401
 
 #if !defined(ENABLE_TPROXY) && !defined(ENABLE_CRUN_FOR_TD) && !defined(PARAMBIN_GENERATION)
-#endif
 #include "dma.h"
-#ifdef ISP2401
 #endif /* !defined(ENABLE_TPROXY) && !defined(ENABLE_CRUN_FOR_TD) */
 
-#endif
 #include "uds/uds_1.0/ia_css_uds_param.h"
 
-#ifdef ISP2401
-
-#endif
 /* dvserence frame */
 struct sh_css_isp_dvs_isp_config {
 	u32 num_horizontal_blocks;

drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds_param.h

@@ -17,7 +17,7 @@
 
 #include "type_support.h"
 
-#ifdef ISP2401
+/* ISP2401 */
 #define BDS_UNIT 8
 #define FRAC_LOG 3
 #define FRAC_ACC BIT(FRAC_LOG)
@@ -25,7 +25,6 @@
 #error "FRAC_ACC and BDS_UNIT need to be merged into one define"
 #endif
 
-#endif
 struct sh_css_isp_bds_params {
 	int baf_strength;
 };

drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.h

-#ifndef ISP2401
 /*
  * Support for Intel Camera Imaging ISP subsystem.
  * Copyright (c) 2015, Intel Corporation.
@@ -27,4 +26,3 @@ ia_css_bayer_io_config(
     const struct sh_css_binary_args *args);
 
 #endif /*__BAYER_IO_HOST_H */
-#endif

drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_param.h

-#ifndef ISP2401
 /*
  * Support for Intel Camera Imaging ISP subsystem.
  * Copyright (c) 2015, Intel Corporation.
@@ -19,4 +18,3 @@
 #include "../common/ia_css_common_io_param.h"
 
 #endif /* __IA_CSS_BAYER_IO_PARAM */
-#endif

drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_types.h

-#ifndef ISP2401
 /*
  * Support for Intel Camera Imaging ISP subsystem.
  * Copyright (c) 2015, Intel Corporation.
@@ -19,4 +18,3 @@
 #include "../common/ia_css_common_io_types.h"
 
 #endif /* __IA_CSS_BAYER_IO_TYPES_H */
-#endif

drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/common/ia_css_common_io_param.h

-#ifndef ISP2401
 /*
  * Support for Intel Camera Imaging ISP subsystem.
  * Copyright (c) 2015, Intel Corporation.
@@ -19,4 +18,3 @@
 #include "../common/ia_css_common_io_types.h"
 
 #endif /* __IA_CSS_COMMON_IO_PARAM */
-#endif

drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/common/ia_css_common_io_types.h

-#ifndef ISP2401
 /*
  * Support for Intel Camera Imaging ISP subsystem.
  * Copyright (c) 2015, Intel Corporation.
@@ -28,4 +27,3 @@ struct ia_css_common_io_config {
 };
 
 #endif /* __IA_CSS_COMMON_IO_TYPES */
-#endif

drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h

-#ifndef ISP2401
 /*
  * Support for Intel Camera Imaging ISP subsystem.
  * Copyright (c) 2015, Intel Corporation.
@@ -19,4 +18,3 @@
 #include "../common/ia_css_common_io_param.h"
 
 #endif
-#endif

drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h

-#ifndef ISP2401
 /*
  * Support for Intel Camera Imaging ISP subsystem.
  * Copyright (c) 2015, Intel Corporation.
@@ -19,4 +18,3 @@
 #include "../common/ia_css_common_io_types.h"
 
 #endif
-#endif

drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h

-#ifdef ISP2401
 /**
 Support for Intel Camera Imaging ISP subsystem.
 Copyright (c) 2010 - 2015, Intel Corporation.
@@ -27,4 +26,3 @@ ia_css_bayer_io_config(
     const struct sh_css_binary_args *args);
 
 #endif /*__BAYER_IO_HOST_H */
-#endif

drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_param.h

-#ifdef ISP2401
 /**
 Support for Intel Camera Imaging ISP subsystem.
 Copyright (c) 2010 - 2015, Intel Corporation.
@@ -19,4 +18,3 @@ more details.
 #include "../common/ia_css_common_io_param.h"
 
 #endif /* __IA_CSS_BAYER_IO_PARAM */
-#endif

drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_types.h

-#ifdef ISP2401
 /**
 Support for Intel Camera Imaging ISP subsystem.
 Copyright (c) 2010 - 2015, Intel Corporation.
@@ -19,4 +18,3 @@ more details.
 #include "../common/ia_css_common_io_types.h"
 
 #endif /* __IA_CSS_BAYER_IO_TYPES_H */
-#endif

drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/common/ia_css_common_io_param.h

-#ifdef ISP2401
 /**
 Support for Intel Camera Imaging ISP subsystem.
 Copyright (c) 2010 - 2015, Intel Corporation.
@@ -19,4 +18,3 @@ more details.
 #include "../common/ia_css_common_io_types.h"
 
 #endif /* __IA_CSS_COMMON_IO_PARAM */
-#endif

drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/common/ia_css_common_io_types.h

-#ifdef ISP2401
 /**
 Support for Intel Camera Imaging ISP subsystem.
 Copyright (c) 2010 - 2015, Intel Corporation.
@@ -28,4 +27,3 @@ struct ia_css_common_io_config {
 };
 
 #endif /* __IA_CSS_COMMON_IO_TYPES */
-#endif

drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.h

-#ifdef ISP2401
 /**
 Support for Intel Camera Imaging ISP subsystem.
 Copyright (c) 2010 - 2015, Intel Corporation.
@@ -27,4 +26,3 @@ ia_css_yuv444_io_config(
     const struct sh_css_binary_args *args);
 
 #endif /*__YUV44_IO_HOST_H */
-#endif

drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h

-#ifdef ISP2401
 /**
 Support for Intel Camera Imaging ISP subsystem.
 Copyright (c) 2010 - 2015, Intel Corporation.
@@ -19,4 +18,3 @@ more details.
 #include "../common/ia_css_common_io_param.h"
 
 #endif
-#endif

drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h

-#ifdef ISP2401
 /**
 Support for Intel Camera Imaging ISP subsystem.
 Copyright (c) 2010 - 2015, Intel Corporation.
@@ -19,4 +18,3 @@ more details.
 #include "../common/ia_css_common_io_types.h"
 
 #endif
-#endif

drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sc/sc_1.0/ia_css_sc.host.h

@@ -31,7 +31,6 @@ ia_css_sc_dump(
     const struct sh_css_isp_sc_params *sc,
     unsigned int level);
 
-#ifdef ISP2401
 /* @brief Configure the shading correction.
  * @param[out]	to	Parameters used in the shading correction kernel in the isp.
  * @param[in]	from	Parameters passed from the host.
@@ -39,6 +38,7 @@ ia_css_sc_dump(
  *
  * This function passes the parameters for the shading correction from the host to the isp.
  */
+/* ISP2401 */
 void
 ia_css_sc_config(
     struct sh_css_isp_sc_isp_config *to,
@@ -57,13 +57,13 @@ ia_css_sc_config(
  * The ia_css_configure_sc() function calls the ia_css_sc_config() function
  * to pass the parameters for the shading correction from the host to the isp.
  */
+/* ISP2401 */
 void
 ia_css_sc_configure(
     const struct ia_css_binary *binary,
     u32 internal_frame_origin_x_bqs_on_sctbl,
     uint32_t internal_frame_origin_y_bqs_on_sctbl);
 
-#endif
 /* ------ deprecated(bz675) : from ------ */
 void
 sh_css_get_shading_settings(const struct ia_css_isp_parameters *params,

drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sc/sc_1.0/ia_css_sc_types.h

@@ -117,12 +117,11 @@ struct ia_css_shading_settings {
 
 /* ------ deprecated(bz675) : to ------ */
 
-#ifdef ISP2401
-
 /* Shading Correction configuration.
  *
  *  NOTE: The shading table size is larger than or equal to the internal frame size.
  */
+/* ISP2401 */
 struct ia_css_sc_configuration {
 	u32 internal_frame_origin_x_bqs_on_sctbl; /** Origin X (in bqs) of internal frame on shading table. */
 	u32 internal_frame_origin_y_bqs_on_sctbl; /** Origin Y (in bqs) of internal frame on shading table. */
@@ -131,6 +130,5 @@ struct ia_css_sc_configuration {
 		Horizontal 1 bqs corresponds to horizontal 2 pixels.
 		Vertical 1 bqs corresponds to vertical 2 pixels. */
 };
-#endif
 
 #endif /* __IA_CSS_SC_TYPES_H */

drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr3/ia_css_tnr3_types.h

-#ifdef ISP2401
 /**
 Support for Intel Camera Imaging ISP subsystem.
 Copyright (c) 2010 - 2015, Intel Corporation.
@@ -62,4 +61,3 @@ struct ia_css_tnr3_kernel_config {
 };
 
 #endif
-#endif

drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.h

@@ -26,14 +26,13 @@ ia_css_xnr3_encode(
     const struct ia_css_xnr3_config *from,
     unsigned int size);
 
-#ifdef ISP2401
+/* ISP2401 */
 void
 ia_css_xnr3_vmem_encode(
     struct sh_css_isp_xnr3_vmem_params *to,
     const struct ia_css_xnr3_config *from,
     unsigned int size);
 
-#endif
 void
 ia_css_xnr3_debug_dtrace(
     const struct ia_css_xnr3_config *config,

drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3_param.h

@@ -16,10 +16,7 @@
 #define __IA_CSS_XNR3_PARAM_H
 
 #include "type_support.h"
-#ifdef ISP2401
-#include "vmem.h" /* needed for VMEM_ARRAY */
-
-#endif
+#include "vmem.h" /* ISP2401: needed for VMEM_ARRAY */
 
 /* Scaling factor of the alpha values: which fixed-point value represents 1.0?
  * It must be chosen such that 1/min_sigma still fits in an ISP vector
@@ -70,7 +67,7 @@ struct sh_css_isp_xnr3_params {
 	struct sh_css_xnr3_blending_params blending;
 };
 
-#ifdef ISP2401
+/* ISP2401 */
 /*
  * STRUCT sh_css_isp_xnr3_vmem_params
  * -----------------------------------------------
@@ -83,5 +80,4 @@ struct sh_css_isp_xnr3_vmem_params {
 	VMEM_ARRAY(c, ISP_VEC_NELEMS);
 };
 
-#endif
 #endif  /*__IA_CSS_XNR3_PARAM_H */

drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/modes/interface/input_buf.isp.h

-#ifndef ISP2401
-/*
- * Support for Intel Camera Imaging ISP subsystem.
- * Copyright (c) 2015, Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- */
-#else
 /**
 Support for Intel Camera Imaging ISP subsystem.
 Copyright (c) 2010 - 2015, Intel Corporation.
@@ -26,7 +11,6 @@ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
 more details.
 */
-#endif
 
 #ifndef _INPUT_BUF_ISP_H_
 #define _INPUT_BUF_ISP_H_

drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/modes/interface/isp_const.h

-#ifndef ISP2401
-/*
- * Support for Intel Camera Imaging ISP subsystem.
- * Copyright (c) 2015, Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- */
-#else
 /**
 Support for Intel Camera Imaging ISP subsystem.
 Copyright (c) 2010 - 2015, Intel Corporation.
@@ -26,7 +11,6 @@ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
 more details.
 */
-#endif
 
 #ifndef _COMMON_ISP_CONST_H_
 #define _COMMON_ISP_CONST_H_

drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/modes/interface/isp_types.h

-#ifndef ISP2401
-/*
- * Support for Intel Camera Imaging ISP subsystem.
- * Copyright (c) 2015, Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- */
-#else
 /**
 Support for Intel Camera Imaging ISP subsystem.
 Copyright (c) 2010 - 2015, Intel Corporation.
@@ -26,7 +11,6 @@ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
 more details.
 */
-#endif
 
 #ifndef _ISP_TYPES_H_
 #define _ISP_TYPES_H_

drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/binary/interface/ia_css_binary.h

-#ifndef ISP2401
-/*
- * Support for Intel Camera Imaging ISP subsystem.
- * Copyright (c) 2015, Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- */
-#else
 /**
 Support for Intel Camera Imaging ISP subsystem.
 Copyright (c) 2010 - 2015, Intel Corporation.
@@ -26,7 +11,6 @@ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
 more details.
 */
-#endif
 
 #ifndef _IA_CSS_BINARY_H_
 #define _IA_CSS_BINARY_H_
@@ -107,10 +91,11 @@ struct ia_css_binary_descr {
 	bool enable_xnr;
 	bool enable_fractional_ds;
 	bool enable_dpc;
-#ifdef ISP2401
+
+	/* ISP2401 */
 	bool enable_luma_only;
 	bool enable_tnr;
-#endif
+
 	bool enable_capture_pp_bli;
 	struct ia_css_resolution dvs_env;
 	enum atomisp_input_format stream_format;

drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isp_param/interface/ia_css_isp_param_types.h

-#ifndef ISP2401
-/*
- * Support for Intel Camera Imaging ISP subsystem.
- * Copyright (c) 2015, Intel Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- */
-#else
 /**
 Support for Intel Camera Imaging ISP subsystem.
 Copyright (c) 2010 - 2015, Intel Corporation.
@@ -26,7 +11,6 @@ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
 FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
 more details.
 */
-#endif
 
 #ifndef _IA_CSS_ISP_PARAM_TYPES_H_
 #define _IA_CSS_ISP_PARAM_TYPES_H_