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

media: atomisp: get rid of trivial version checks at *.h 



Most of the remaining ifdefs check for ISP2401 are trivial.

Get rid of them.

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

drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/input_system_global.h

+4 −4
Original line number Diff line number Diff line
@@ -125,9 +125,9 @@ struct input_system_cfg_s { 
	input_system_input_port_ID_t	input_port_id;



	input_system_source_type_t	mode;

#ifdef ISP2401



	/* ISP2401 */

	input_system_polling_mode_t	polling_mode;

#endif



	bool online;

	bool raw_packed;
@@ -180,10 +180,10 @@ struct virtual_input_system_stream_s { 
	u8 online;

	s8 linked_isys_stream_id;

	u8 valid;

#ifdef ISP2401



	/* ISP2401 */

	input_system_polling_mode_t	polling_mode;

	s32 subscr_index;

#endif

};



typedef struct virtual_input_system_stream_cfg_s

drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/binary/interface/ia_css_binary.h

+0 −8
Original line number Diff line number Diff line
@@ -182,20 +182,12 @@ ia_css_binary_find(struct ia_css_binary_descr *descr, 
 * @param[in] type: The shading correction type.

 * @param[in] required_bds_factor: The bayer downscaling factor required in the pipe.

 * @param[in] stream_config: The stream configuration.

#ifndef ISP2401

 * @param[out] info: The shading information.

#else

 * @param[out] shading_info: The shading information.

 *		The shading information necessary as API is stored in the shading_info.

#endif

 *		The driver needs to get this information to generate

#ifndef ISP2401

 *		the shading table directly required in the isp.

#else

 *		the shading table directly required from ISP.

 * @param[out] pipe_config: The pipe configuration.

 *		The shading information related to ISP (but, not necessary as API) is stored in the pipe_config.

#endif

 * @return	IA_CSS_SUCCESS or error code upon error.

 *

 */

drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/bufq/interface/ia_css_bufq.h

+1 −17
Original line number Diff line number Diff line 
#ifndef ISP2401

/*

 * Support for Intel Camera Imaging ISP subsystem.

 * Copyright (c) 2015, Intel Corporation.

 * Copyright (c) 2010 - 2015, Intel Corporation.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,
@@ -12,21 +11,6 @@ 
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 */

#else

/**

Support for Intel Camera Imaging ISP subsystem.

Copyright (c) 2010 - 2015, Intel Corporation.



This program is free software; you can redistribute it and/or modify it

under the terms and conditions of the GNU General Public License,

version 2, as published by the Free Software Foundation.



This program is distributed in the hope it will be useful, but WITHOUT

ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

more details.

*/

#endif



#ifndef _IA_CSS_BUFQ_H

#define _IA_CSS_BUFQ_H

drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/bufq/interface/ia_css_bufq_comm.h

+0 −16
Original line number Diff line number Diff line 
#ifndef ISP2401

/*

 * Support for Intel Camera Imaging ISP subsystem.

 * Copyright (c) 2015, Intel Corporation.
@@ -12,21 +11,6 @@ 
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 */

#else

/**

Support for Intel Camera Imaging ISP subsystem.

Copyright (c) 2010 - 2015, Intel Corporation.



This program is free software; you can redistribute it and/or modify it

under the terms and conditions of the GNU General Public License,

version 2, as published by the Free Software Foundation.



This program is distributed in the hope it will be useful, but WITHOUT

ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

more details.

*/

#endif



#ifndef _IA_CSS_BUFQ_COMM_H

#define _IA_CSS_BUFQ_COMM_H

drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/interface/ia_css_debug.h

+4 −11
Original line number Diff line number Diff line
@@ -26,11 +26,8 @@ 
#include "ia_css_stream_public.h"

#include "ia_css_metadata.h"

#include "sh_css_internal.h"

#ifdef ISP2401

#if defined(IS_ISP_2500_SYSTEM)

/* ISP2500 */

#include "ia_css_pipe.h"

#endif

#endif



/* available levels */

/*! Level for tracing errors */
@@ -177,7 +174,7 @@ void ia_css_debug_dump_isp_state(void); 
 */

void ia_css_debug_dump_sp_state(void);



#ifdef ISP2401

/* ISP2401 */

/*! @brief Dump GAC hardware state.

 * Dumps the GAC ACB hardware registers. may be useful for

 * detecting a GAC which got hang.
@@ -185,7 +182,6 @@ void ia_css_debug_dump_sp_state(void); 
 */

void ia_css_debug_dump_gac_state(void);



#endif

/*! @brief Dump dma controller state.

 * Dumps the dma controller state to tracing output.

 * @return	None
@@ -472,7 +468,7 @@ bool ia_css_debug_mode_enable_dma_channel( 
 */

void ia_css_debug_dump_trace(void);



#ifdef ISP2401

/* ISP2401 */

/**

 * @brief Program counter dumping (in loop)

 *
@@ -484,7 +480,7 @@ void ia_css_debug_dump_trace(void); 
 */

void ia_css_debug_pc_dump(sp_ID_t id, unsigned int num_of_dumps);



#if defined(IS_ISP_2500_SYSTEM)

/* ISP2500 */

/*! @brief Dump all states for ISP hang case.

 * Dumps the ISP previous and current configurations

 * GACs status, SP0/1 statuses.
@@ -503,7 +499,4 @@ void ia_css_debug_dump_hang_status( 
 */

void ia_css_debug_ext_command_handler(void);



#endif

#endif



#endif /* _IA_CSS_DEBUG_H_ */