Skip to content

Commit 35a933d

Browse files
committed
media: atomisp: get rid of a duplicated file
The contents of hive_isp_css_2401_irq_types_hrt.h and hive_isp_css_common/irq_global.h are identical, except for one unused enum: On isp2401, this IRQ line has this name: hrt_isp_css_irq_is2401 = HIVE_GP_DEV_IRQ_ISP_PMEM_ERROR_BIT_ID, While the same bit is named as: hrt_isp_css_irq_isp_pmem_error = HIVE_GP_DEV_IRQ_ISP_PMEM_ERROR_BIT_ID, At the isp2400 version. Remove one of them, in order to reduce the code differences between those two versions. Signed-off-by: Mauro Carvalho Chehab <[email protected]>
1 parent 9024001 commit 35a933d

File tree

3 files changed

+1
-78
lines changed

3 files changed

+1
-78
lines changed

drivers/staging/media/atomisp/pci/hive_isp_css_2401_irq_types_hrt.h

Lines changed: 0 additions & 69 deletions
This file was deleted.

drivers/staging/media/atomisp/pci/hive_isp_css_common/irq_global.h

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,7 @@
2323

2424
/* We cannot include the (hrt host ID) file defining the "CSS_RECEIVER" property without side effects */
2525
#ifndef HAS_NO_RX
26-
#if defined(IS_ISP_2400_MAMOIADA_SYSTEM)
27-
/*#define CSS_RECEIVER testbench_isp_inp_sys_csi_receiver*/
28-
#include "hive_isp_css_irq_types_hrt.h" /* enum hrt_isp_css_irq */
29-
#elif defined(IS_ISP_2401_MAMOIADA_SYSTEM)
30-
/*#define CSS_RECEIVER testbench_isp_is_2400_inp_sys_csi_receiver*/
31-
#include "hive_isp_css_2401_irq_types_hrt.h" /* enum hrt_isp_css_irq */
32-
#else
33-
#error "irq_global.h: 2400_SYSTEM must be one of {2400, 2401 }"
34-
#endif
26+
#include "irq_types_hrt.h"
3527
#endif
3628

3729
/* The IRQ is not mapped uniformly on its related interfaces */

0 commit comments

Comments
 (0)