Commit f172f6ee authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: atomisp: cleanup contents of css_2401_csi2p_system 



Everything there is for ISP2401 only. So, we can trivially
solve all ifdefs at once.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 9935e292

drivers/staging/media/atomisp/pci/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_configs.c

+0 −2
Original line number Diff line number Diff line
@@ -273,7 +273,6 @@ ia_css_configure_output( 
}



/* Code generated by genparam/genconfig.c:gen_configure_function() */

#ifdef ISP2401



void

ia_css_configure_sc(
@@ -302,7 +301,6 @@ ia_css_configure_sc( 
}



/* Code generated by genparam/genconfig.c:gen_configure_function() */

#endif



void

ia_css_configure_raw(

drivers/staging/media/atomisp/pci/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_params.c

+0 −150
Original line number Diff line number Diff line
@@ -1720,7 +1720,6 @@ ia_css_process_xnr3( 
					    "ia_css_process_xnr3() leave:\n");

		}

	}

#ifdef ISP2401

	{

		unsigned int size   =

		    stage->binary->info->mem_offsets.offsets.param->vmem.xnr3.size;
@@ -1744,7 +1743,6 @@ ia_css_process_xnr3( 
					    "ia_css_process_xnr3() leave:\n");

		}

	}

#endif

}



/* Code generated by genparam/gencode.c:gen_param_process_table() */
@@ -1836,10 +1834,6 @@ ia_css_set_dp_config(struct ia_css_isp_parameters *params, 
	ia_css_dp_debug_dtrace(config, IA_CSS_DEBUG_TRACE);

	params->dp_config = *config;

	params->config_changed[IA_CSS_DP_ID] = true;

#ifndef ISP2401

	params->config_changed[IA_CSS_DP_ID] = true;



#endif

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

			    "ia_css_set_dp_config() leave: return_void\n");

}
@@ -1879,10 +1873,6 @@ ia_css_set_wb_config(struct ia_css_isp_parameters *params, 
	ia_css_wb_debug_dtrace(config, IA_CSS_DEBUG_TRACE);

	params->wb_config = *config;

	params->config_changed[IA_CSS_WB_ID] = true;

#ifndef ISP2401

	params->config_changed[IA_CSS_WB_ID] = true;



#endif

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

			    "ia_css_set_wb_config() leave: return_void\n");

}
@@ -1922,10 +1912,6 @@ ia_css_set_tnr_config(struct ia_css_isp_parameters *params, 
	ia_css_tnr_debug_dtrace(config, IA_CSS_DEBUG_TRACE);

	params->tnr_config = *config;

	params->config_changed[IA_CSS_TNR_ID] = true;

#ifndef ISP2401

	params->config_changed[IA_CSS_TNR_ID] = true;



#endif

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

			    "ia_css_set_tnr_config() leave: return_void\n");

}
@@ -1965,10 +1951,6 @@ ia_css_set_ob_config(struct ia_css_isp_parameters *params, 
	ia_css_ob_debug_dtrace(config, IA_CSS_DEBUG_TRACE);

	params->ob_config = *config;

	params->config_changed[IA_CSS_OB_ID] = true;

#ifndef ISP2401

	params->config_changed[IA_CSS_OB_ID] = true;



#endif

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

			    "ia_css_set_ob_config() leave: return_void\n");

}
@@ -2008,10 +1990,6 @@ ia_css_set_de_config(struct ia_css_isp_parameters *params, 
	ia_css_de_debug_dtrace(config, IA_CSS_DEBUG_TRACE);

	params->de_config = *config;

	params->config_changed[IA_CSS_DE_ID] = true;

#ifndef ISP2401

	params->config_changed[IA_CSS_DE_ID] = true;



#endif

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

			    "ia_css_set_de_config() leave: return_void\n");

}
@@ -2051,10 +2029,6 @@ ia_css_set_anr_config(struct ia_css_isp_parameters *params, 
	ia_css_anr_debug_dtrace(config, IA_CSS_DEBUG_TRACE);

	params->anr_config = *config;

	params->config_changed[IA_CSS_ANR_ID] = true;

#ifndef ISP2401

	params->config_changed[IA_CSS_ANR_ID] = true;



#endif

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

			    "ia_css_set_anr_config() leave: return_void\n");

}
@@ -2094,10 +2068,6 @@ ia_css_set_anr2_config(struct ia_css_isp_parameters *params, 
	ia_css_anr2_debug_dtrace(config, IA_CSS_DEBUG_TRACE);

	params->anr_thres = *config;

	params->config_changed[IA_CSS_ANR2_ID] = true;

#ifndef ISP2401

	params->config_changed[IA_CSS_ANR2_ID] = true;



#endif

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

			    "ia_css_set_anr2_config() leave: return_void\n");

}
@@ -2137,10 +2107,6 @@ ia_css_set_ce_config(struct ia_css_isp_parameters *params, 
	ia_css_ce_debug_dtrace(config, IA_CSS_DEBUG_TRACE);

	params->ce_config = *config;

	params->config_changed[IA_CSS_CE_ID] = true;

#ifndef ISP2401

	params->config_changed[IA_CSS_CE_ID] = true;



#endif

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

			    "ia_css_set_ce_config() leave: return_void\n");

}
@@ -2180,10 +2146,6 @@ ia_css_set_ecd_config(struct ia_css_isp_parameters *params, 
	ia_css_ecd_debug_dtrace(config, IA_CSS_DEBUG_TRACE);

	params->ecd_config = *config;

	params->config_changed[IA_CSS_ECD_ID] = true;

#ifndef ISP2401

	params->config_changed[IA_CSS_ECD_ID] = true;



#endif

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

			    "ia_css_set_ecd_config() leave: return_void\n");

}
@@ -2223,10 +2185,6 @@ ia_css_set_ynr_config(struct ia_css_isp_parameters *params, 
	ia_css_ynr_debug_dtrace(config, IA_CSS_DEBUG_TRACE);

	params->ynr_config = *config;

	params->config_changed[IA_CSS_YNR_ID] = true;

#ifndef ISP2401

	params->config_changed[IA_CSS_YNR_ID] = true;



#endif

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

			    "ia_css_set_ynr_config() leave: return_void\n");

}
@@ -2266,10 +2224,6 @@ ia_css_set_fc_config(struct ia_css_isp_parameters *params, 
	ia_css_fc_debug_dtrace(config, IA_CSS_DEBUG_TRACE);

	params->fc_config = *config;

	params->config_changed[IA_CSS_FC_ID] = true;

#ifndef ISP2401

	params->config_changed[IA_CSS_FC_ID] = true;



#endif

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

			    "ia_css_set_fc_config() leave: return_void\n");

}
@@ -2309,10 +2263,6 @@ ia_css_set_cnr_config(struct ia_css_isp_parameters *params, 
	ia_css_cnr_debug_dtrace(config, IA_CSS_DEBUG_TRACE);

	params->cnr_config = *config;

	params->config_changed[IA_CSS_CNR_ID] = true;

#ifndef ISP2401

	params->config_changed[IA_CSS_CNR_ID] = true;



#endif

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

			    "ia_css_set_cnr_config() leave: return_void\n");

}
@@ -2352,10 +2302,6 @@ ia_css_set_macc_config(struct ia_css_isp_parameters *params, 
	ia_css_macc_debug_dtrace(config, IA_CSS_DEBUG_TRACE);

	params->macc_config = *config;

	params->config_changed[IA_CSS_MACC_ID] = true;

#ifndef ISP2401

	params->config_changed[IA_CSS_MACC_ID] = true;



#endif

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

			    "ia_css_set_macc_config() leave: return_void\n");

}
@@ -2395,10 +2341,6 @@ ia_css_set_ctc_config(struct ia_css_isp_parameters *params, 
	ia_css_ctc_debug_dtrace(config, IA_CSS_DEBUG_TRACE);

	params->ctc_config = *config;

	params->config_changed[IA_CSS_CTC_ID] = true;

#ifndef ISP2401

	params->config_changed[IA_CSS_CTC_ID] = true;



#endif

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

			    "ia_css_set_ctc_config() leave: return_void\n");

}
@@ -2436,10 +2378,6 @@ ia_css_set_aa_config(struct ia_css_isp_parameters *params, 
	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "ia_css_set_aa_config() enter:\n");

	params->aa_config = *config;

	params->config_changed[IA_CSS_AA_ID] = true;

#ifndef ISP2401

	params->config_changed[IA_CSS_AA_ID] = true;



#endif

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

			    "ia_css_set_aa_config() leave: return_void\n");

}
@@ -2479,10 +2417,6 @@ ia_css_set_yuv2rgb_config(struct ia_css_isp_parameters *params, 
	ia_css_yuv2rgb_debug_dtrace(config, IA_CSS_DEBUG_TRACE);

	params->yuv2rgb_cc_config = *config;

	params->config_changed[IA_CSS_YUV2RGB_ID] = true;

#ifndef ISP2401

	params->config_changed[IA_CSS_YUV2RGB_ID] = true;



#endif

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

			    "ia_css_set_yuv2rgb_config() leave: return_void\n");

}
@@ -2522,10 +2456,6 @@ ia_css_set_rgb2yuv_config(struct ia_css_isp_parameters *params, 
	ia_css_rgb2yuv_debug_dtrace(config, IA_CSS_DEBUG_TRACE);

	params->rgb2yuv_cc_config = *config;

	params->config_changed[IA_CSS_RGB2YUV_ID] = true;

#ifndef ISP2401

	params->config_changed[IA_CSS_RGB2YUV_ID] = true;



#endif

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

			    "ia_css_set_rgb2yuv_config() leave: return_void\n");

}
@@ -2565,10 +2495,6 @@ ia_css_set_csc_config(struct ia_css_isp_parameters *params, 
	ia_css_csc_debug_dtrace(config, IA_CSS_DEBUG_TRACE);

	params->cc_config = *config;

	params->config_changed[IA_CSS_CSC_ID] = true;

#ifndef ISP2401

	params->config_changed[IA_CSS_CSC_ID] = true;



#endif

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

			    "ia_css_set_csc_config() leave: return_void\n");

}
@@ -2609,10 +2535,6 @@ ia_css_set_nr_config(struct ia_css_isp_parameters *params, 
	params->nr_config = *config;

	params->config_changed[IA_CSS_BNR_ID] = true;

	params->config_changed[IA_CSS_NR_ID] = true;

#ifndef ISP2401

	params->config_changed[IA_CSS_NR_ID] = true;



#endif

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

			    "ia_css_set_nr_config() leave: return_void\n");

}
@@ -2652,10 +2574,6 @@ ia_css_set_gc_config(struct ia_css_isp_parameters *params, 
	ia_css_gc_debug_dtrace(config, IA_CSS_DEBUG_TRACE);

	params->gc_config = *config;

	params->config_changed[IA_CSS_GC_ID] = true;

#ifndef ISP2401

	params->config_changed[IA_CSS_GC_ID] = true;



#endif

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

			    "ia_css_set_gc_config() leave: return_void\n");

}
@@ -2699,10 +2617,6 @@ ia_css_set_sdis_horicoef_config(struct ia_css_isp_parameters *params, 
	params->config_changed[IA_CSS_SDIS_VERTCOEF_ID] = true;

	params->config_changed[IA_CSS_SDIS_HORIPROJ_ID] = true;

	params->config_changed[IA_CSS_SDIS_VERTPROJ_ID] = true;

#ifndef ISP2401

	params->config_changed[IA_CSS_SDIS_HORICOEF_ID] = true;



#endif

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

			    "ia_css_set_sdis_horicoef_config() leave: return_void\n");

}
@@ -2746,10 +2660,6 @@ ia_css_set_sdis_vertcoef_config(struct ia_css_isp_parameters *params, 
	params->config_changed[IA_CSS_SDIS_VERTCOEF_ID] = true;

	params->config_changed[IA_CSS_SDIS_HORIPROJ_ID] = true;

	params->config_changed[IA_CSS_SDIS_VERTPROJ_ID] = true;

#ifndef ISP2401

	params->config_changed[IA_CSS_SDIS_VERTCOEF_ID] = true;



#endif

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

			    "ia_css_set_sdis_vertcoef_config() leave: return_void\n");

}
@@ -2793,10 +2703,6 @@ ia_css_set_sdis_horiproj_config(struct ia_css_isp_parameters *params, 
	params->config_changed[IA_CSS_SDIS_VERTCOEF_ID] = true;

	params->config_changed[IA_CSS_SDIS_HORIPROJ_ID] = true;

	params->config_changed[IA_CSS_SDIS_VERTPROJ_ID] = true;

#ifndef ISP2401

	params->config_changed[IA_CSS_SDIS_HORIPROJ_ID] = true;



#endif

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

			    "ia_css_set_sdis_horiproj_config() leave: return_void\n");

}
@@ -2840,10 +2746,6 @@ ia_css_set_sdis_vertproj_config(struct ia_css_isp_parameters *params, 
	params->config_changed[IA_CSS_SDIS_VERTCOEF_ID] = true;

	params->config_changed[IA_CSS_SDIS_HORIPROJ_ID] = true;

	params->config_changed[IA_CSS_SDIS_VERTPROJ_ID] = true;

#ifndef ISP2401

	params->config_changed[IA_CSS_SDIS_VERTPROJ_ID] = true;



#endif

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

			    "ia_css_set_sdis_vertproj_config() leave: return_void\n");

}
@@ -2887,10 +2789,6 @@ ia_css_set_sdis2_horicoef_config(struct ia_css_isp_parameters *params, 
	params->config_changed[IA_CSS_SDIS2_VERTCOEF_ID] = true;

	params->config_changed[IA_CSS_SDIS2_HORIPROJ_ID] = true;

	params->config_changed[IA_CSS_SDIS2_VERTPROJ_ID] = true;

#ifndef ISP2401

	params->config_changed[IA_CSS_SDIS2_HORICOEF_ID] = true;



#endif

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

			    "ia_css_set_sdis2_horicoef_config() leave: return_void\n");

}
@@ -2934,10 +2832,6 @@ ia_css_set_sdis2_vertcoef_config(struct ia_css_isp_parameters *params, 
	params->config_changed[IA_CSS_SDIS2_VERTCOEF_ID] = true;

	params->config_changed[IA_CSS_SDIS2_HORIPROJ_ID] = true;

	params->config_changed[IA_CSS_SDIS2_VERTPROJ_ID] = true;

#ifndef ISP2401

	params->config_changed[IA_CSS_SDIS2_VERTCOEF_ID] = true;



#endif

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

			    "ia_css_set_sdis2_vertcoef_config() leave: return_void\n");

}
@@ -2981,10 +2875,6 @@ ia_css_set_sdis2_horiproj_config(struct ia_css_isp_parameters *params, 
	params->config_changed[IA_CSS_SDIS2_VERTCOEF_ID] = true;

	params->config_changed[IA_CSS_SDIS2_HORIPROJ_ID] = true;

	params->config_changed[IA_CSS_SDIS2_VERTPROJ_ID] = true;

#ifndef ISP2401

	params->config_changed[IA_CSS_SDIS2_HORIPROJ_ID] = true;



#endif

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

			    "ia_css_set_sdis2_horiproj_config() leave: return_void\n");

}
@@ -3028,10 +2918,6 @@ ia_css_set_sdis2_vertproj_config(struct ia_css_isp_parameters *params, 
	params->config_changed[IA_CSS_SDIS2_VERTCOEF_ID] = true;

	params->config_changed[IA_CSS_SDIS2_HORIPROJ_ID] = true;

	params->config_changed[IA_CSS_SDIS2_VERTPROJ_ID] = true;

#ifndef ISP2401

	params->config_changed[IA_CSS_SDIS2_VERTPROJ_ID] = true;



#endif

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

			    "ia_css_set_sdis2_vertproj_config() leave: return_void\n");

}
@@ -3071,10 +2957,6 @@ ia_css_set_r_gamma_config(struct ia_css_isp_parameters *params, 
	ia_css_r_gamma_debug_dtrace(config, IA_CSS_DEBUG_TRACE);

	params->r_gamma_table = *config;

	params->config_changed[IA_CSS_R_GAMMA_ID] = true;

#ifndef ISP2401

	params->config_changed[IA_CSS_R_GAMMA_ID] = true;



#endif

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

			    "ia_css_set_r_gamma_config() leave: return_void\n");

}
@@ -3114,10 +2996,6 @@ ia_css_set_g_gamma_config(struct ia_css_isp_parameters *params, 
	ia_css_g_gamma_debug_dtrace(config, IA_CSS_DEBUG_TRACE);

	params->g_gamma_table = *config;

	params->config_changed[IA_CSS_G_GAMMA_ID] = true;

#ifndef ISP2401

	params->config_changed[IA_CSS_G_GAMMA_ID] = true;



#endif

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

			    "ia_css_set_g_gamma_config() leave: return_void\n");

}
@@ -3157,10 +3035,6 @@ ia_css_set_b_gamma_config(struct ia_css_isp_parameters *params, 
	ia_css_b_gamma_debug_dtrace(config, IA_CSS_DEBUG_TRACE);

	params->b_gamma_table = *config;

	params->config_changed[IA_CSS_B_GAMMA_ID] = true;

#ifndef ISP2401

	params->config_changed[IA_CSS_B_GAMMA_ID] = true;



#endif

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

			    "ia_css_set_b_gamma_config() leave: return_void\n");

}
@@ -3201,10 +3075,6 @@ ia_css_set_xnr_table_config(struct ia_css_isp_parameters *params, 
	ia_css_xnr_table_debug_dtrace(config, IA_CSS_DEBUG_TRACE);

	params->xnr_table = *config;

	params->config_changed[IA_CSS_XNR_TABLE_ID] = true;

#ifndef ISP2401

	params->config_changed[IA_CSS_XNR_TABLE_ID] = true;



#endif

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

			    "ia_css_set_xnr_table_config() leave: return_void\n");

}
@@ -3244,10 +3114,6 @@ ia_css_set_formats_config(struct ia_css_isp_parameters *params, 
	ia_css_formats_debug_dtrace(config, IA_CSS_DEBUG_TRACE);

	params->formats_config = *config;

	params->config_changed[IA_CSS_FORMATS_ID] = true;

#ifndef ISP2401

	params->config_changed[IA_CSS_FORMATS_ID] = true;



#endif

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

			    "ia_css_set_formats_config() leave: return_void\n");

}
@@ -3287,10 +3153,6 @@ ia_css_set_xnr_config(struct ia_css_isp_parameters *params, 
	ia_css_xnr_debug_dtrace(config, IA_CSS_DEBUG_TRACE);

	params->xnr_config = *config;

	params->config_changed[IA_CSS_XNR_ID] = true;

#ifndef ISP2401

	params->config_changed[IA_CSS_XNR_ID] = true;



#endif

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

			    "ia_css_set_xnr_config() leave: return_void\n");

}
@@ -3330,10 +3192,6 @@ ia_css_set_xnr3_config(struct ia_css_isp_parameters *params, 
	ia_css_xnr3_debug_dtrace(config, IA_CSS_DEBUG_TRACE);

	params->xnr3_config = *config;

	params->config_changed[IA_CSS_XNR3_ID] = true;

#ifndef ISP2401

	params->config_changed[IA_CSS_XNR3_ID] = true;



#endif

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

			    "ia_css_set_xnr3_config() leave: return_void\n");

}
@@ -3374,10 +3232,6 @@ ia_css_set_s3a_config(struct ia_css_isp_parameters *params, 
	params->s3a_config = *config;

	params->config_changed[IA_CSS_BH_ID] = true;

	params->config_changed[IA_CSS_S3A_ID] = true;

#ifndef ISP2401

	params->config_changed[IA_CSS_S3A_ID] = true;



#endif

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

			    "ia_css_set_s3a_config() leave: return_void\n");

}
@@ -3417,10 +3271,6 @@ ia_css_set_output_config(struct ia_css_isp_parameters *params, 
	ia_css_output_debug_dtrace(config, IA_CSS_DEBUG_TRACE);

	params->output_config = *config;

	params->config_changed[IA_CSS_OUTPUT_ID] = true;

#ifndef ISP2401

	params->config_changed[IA_CSS_OUTPUT_ID] = true;



#endif

	ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE_PRIVATE,

			    "ia_css_set_output_config() leave: return_void\n");

}

drivers/staging/media/atomisp/pci/css_2401_csi2p_system/spmem_dump.c

+0 −1720

File changed.

Preview size limit exceeded, changes collapsed.