From 977e77c0b5c2fa1050a7307648ca1d208caed83c Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Thu, 23 Apr 2020 08:38:49 +0200 Subject: [PATCH] media: atomisp: make sh_css_struct.h independent of ISP version Use the same struct for both ISP2400 and ISP2401. Signed-off-by: Mauro Carvalho Chehab --- .../media/atomisp/pci/atomisp2/css2400/sh_css_struct.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_struct.h b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_struct.h index 482c99b..81b9598 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_struct.h +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_struct.h @@ -42,16 +42,17 @@ struct sh_css { struct ia_css_pipe *all_pipes[IA_CSS_PIPELINE_NUM_MAX]; void *(*malloc)(size_t bytes, bool zero_mem); void (*free)(void *ptr); -#ifdef ISP2401 + void (*flush)(struct ia_css_acc_fw *fw); + +/* ISP2401 */ void *(*malloc_ex)(size_t bytes, bool zero_mem, const char *caller_func, int caller_line); void (*free_ex)(void *ptr, const char *caller_func, int caller_line); -#endif - void (*flush)(struct ia_css_acc_fw *fw); - bool check_system_idle; -#ifndef ISP2401 + +/* ISP2400 */ bool stop_copy_preview; -#endif + + bool check_system_idle; unsigned int num_cont_raw_frames; #if defined(USE_INPUT_SYSTEM_VERSION_2) || defined(USE_INPUT_SYSTEM_VERSION_2401) unsigned int num_mipi_frames[N_CSI_PORTS]; -- 2.7.4