Commit 641c2292 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: atomisp: get rid of version-dependent globals 



Replace all occurrences along the atomisp tree for the conditional
compilation macros found at system_global.h, replacing them by
tests wheather ISP2401 is defined or not.

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

drivers/staging/media/atomisp/pci/css_2401_system/host/isys_irq_local.h

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 


#include <type_support.h>



#if defined(USE_INPUT_SYSTEM_VERSION_2401)

#if defined(ISP2401)



typedef struct isys_irqc_state_s isys_irqc_state_t;
@@ -31,6 +31,6 @@ struct isys_irqc_state_s { 
	/*hrt_data clear;	*/	/* write-only register */

};



#endif /* defined(USE_INPUT_SYSTEM_VERSION_2401) */

#endif /* defined(ISP2401) */



#endif	/* __ISYS_IRQ_LOCAL_H__ */

drivers/staging/media/atomisp/pci/css_2401_system/host/isys_irq_private.h

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include "isys_irq_global.h"

#include "isys_irq_local.h"



#if defined(USE_INPUT_SYSTEM_VERSION_2401)

#if defined(ISP2401)



/* -------------------------------------------------------+

 |             Native command interface (NCI)             |
@@ -102,6 +102,6 @@ STORAGE_CLASS_ISYS2401_IRQ_C hrt_data isys_irqc_reg_load( 


/* end of DLI */



#endif /* defined(USE_INPUT_SYSTEM_VERSION_2401) */

#endif /* defined(ISP2401) */



#endif	/* __ISYS_IRQ_PRIVATE_H__ */

drivers/staging/media/atomisp/pci/css_2401_system/isys_irq_global.h

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#ifndef __ISYS_IRQ_GLOBAL_H__

#define __ISYS_IRQ_GLOBAL_H__



#if defined(USE_INPUT_SYSTEM_VERSION_2401)

#if defined(ISP2401)



/* Register offset/index from base location */

#define ISYS_IRQ_EDGE_REG_IDX		(0)
@@ -31,6 +31,6 @@ 
#define ISYS_IRQ_CLEAR_REG_VALUE	(0xFFFF)

#define ISYS_IRQ_ENABLE_REG_VALUE	(0xFFFF)



#endif /* defined(USE_INPUT_SYSTEM_VERSION_2401) */

#endif /* defined(ISP2401) */



#endif	/* __ISYS_IRQ_GLOBAL_H__ */

drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_formatter.c

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 


#include "system_global.h"



#ifdef USE_INPUT_SYSTEM_VERSION_2

#ifndef ISP2401



#include "input_formatter.h"

#include <type_support.h>

drivers/staging/media/atomisp/pci/hive_isp_css_common/host/input_system.c

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 


#include "system_global.h"



#ifdef USE_INPUT_SYSTEM_VERSION_2

#ifndef ISP2401



#include "input_system.h"

#include <type_support.h>