diff options
| author | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-05-31 13:28:12 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-06-11 19:09:36 +0200 |
| commit | 0a4b8c457b04af7409348ceb2484e8c726ee6953 (patch) | |
| tree | 3186135ad0cc15d46f6a5cb0735903af199e79a8 /drivers/staging/media/atomisp/pci/hive_isp_css_common | |
| parent | d0b674ac625058dac7888c08d9e26d338f4f23b9 (diff) | |
| download | linux-0a4b8c457b04af7409348ceb2484e8c726ee6953.tar.bz2 | |
media: atomisp: simplify IRQ ifdef logic
There are lots of mess with IRQ ifdef settings. As the
*_global.h will already detect the type of IRQ system at
compile time, we can get rid of them, replacing by just
one ifdef for ISP2401.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'drivers/staging/media/atomisp/pci/hive_isp_css_common')
| -rw-r--r-- | drivers/staging/media/atomisp/pci/hive_isp_css_common/isp_global.h | 10 | ||||
| -rw-r--r-- | drivers/staging/media/atomisp/pci/hive_isp_css_common/sp_global.h | 10 |
2 files changed, 2 insertions, 18 deletions
diff --git a/drivers/staging/media/atomisp/pci/hive_isp_css_common/isp_global.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/isp_global.h index 5ea3f1938fbd..5212d52198bd 100644 --- a/drivers/staging/media/atomisp/pci/hive_isp_css_common/isp_global.h +++ b/drivers/staging/media/atomisp/pci/hive_isp_css_common/isp_global.h @@ -18,16 +18,10 @@ #include <system_local.h> -#if defined(HAS_ISP_2401_MAMOIADA) -#define IS_ISP_2401_MAMOIADA - +#ifdef ISP2401 #include "isp2401_mamoiada_params.h" -#elif defined(HAS_ISP_2400_MAMOIADA) -#define IS_ISP_2400_MAMOIADA - -#include "isp2400_mamoiada_params.h" #else -#error "isp_global_h: ISP_2400_MAMOIDA must be one of {2400, 2401 }" +#include "isp2400_mamoiada_params.h" #endif #define ISP_PMEM_WIDTH_LOG2 ISP_LOG2_PMEM_WIDTH diff --git a/drivers/staging/media/atomisp/pci/hive_isp_css_common/sp_global.h b/drivers/staging/media/atomisp/pci/hive_isp_css_common/sp_global.h index 125fe577073f..b8338f9b5c0c 100644 --- a/drivers/staging/media/atomisp/pci/hive_isp_css_common/sp_global.h +++ b/drivers/staging/media/atomisp/pci/hive_isp_css_common/sp_global.h @@ -18,17 +18,7 @@ #include <system_local.h> -#if defined(HAS_SP_2401) -#define IS_SP_2401 -/* 2401 uses 2400 */ #include <scalar_processor_2400_params.h> -#elif defined(HAS_SP_2400) -#define IS_SP_2400 - -#include <scalar_processor_2400_params.h> -#else -#error "sp_global.h: SP_2400 must be one of {2400, 2401 }" -#endif #define SP_PMEM_WIDTH_LOG2 SP_PMEM_LOG_WIDTH_BITS #define SP_PMEM_SIZE SP_PMEM_DEPTH |