Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e35d4427 authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman
Browse files

atomisp: __SP is never defined so scrub this ifdef 



Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0d93fe75

drivers/staging/media/atomisp/pci/atomisp2/css2400/base/circbuf/interface/ia_css_circbuf.h

+0 −9
Original line number Diff line number Diff line
@@ -23,11 +23,6 @@ 
#include <platform_support.h>

#include "ia_css_circbuf_comm.h"

#include "ia_css_circbuf_desc.h"

#ifdef __SP

#include "event_handler.sp.h"

/* We should not #define SP_FILE_ID here, because we are in a header file. */

#include "ia_css_sp_assert_level.sp.h"

#endif



/****************************************************************

 *
@@ -287,11 +282,7 @@ STORAGE_CLASS_INLINE void ia_css_circbuf_write( 
	OP___assert(cb->desc != NULL);



	/* Cannot continue as the queue is full*/

#ifdef __SP

	SP_ASSERT_FATAL(!ia_css_circbuf_is_full(cb));

#else

	assert(!ia_css_circbuf_is_full(cb));

#endif



	ia_css_circbuf_elem_cpy(&elem, &cb->elems[cb->desc->end]);

drivers/staging/media/atomisp/pci/atomisp2/css2400/base/circbuf/src/circbuf.c

+0 −13
Original line number Diff line number Diff line
@@ -16,15 +16,6 @@ 


#include <assert_support.h>



#ifdef __SP

#include <hive_isp_css_sp_api_modified.h>

#include <ia_css_sp_file_id.sp.h>

#ifndef SP_FILE_ID

#define SP_FILE_ID SP_FILE_ID_CIRCBUF /* overrule default in ia_css_sp_assert_level.sp.h */

#endif

#include <ia_css_sp_assert_level.sp.h>

#endif



/**********************************************************************

 *

 * Forward declarations.
@@ -117,11 +108,7 @@ uint32_t ia_css_circbuf_pop(ia_css_circbuf_t *cb) 
	uint32_t ret;

	ia_css_circbuf_elem_t elem;



#ifdef __SP

	SP_ASSERT_FATAL(!ia_css_circbuf_is_empty(cb));

#else

	assert(!ia_css_circbuf_is_empty(cb));

#endif



	/* read an element from the buffer */

	elem = ia_css_circbuf_read(cb);

drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/math_support.h

+2 −2
Original line number Diff line number Diff line
@@ -209,13 +209,13 @@ STORAGE_CLASS_INLINE unsigned int ceil_pow2(unsigned int a) 


#endif /* !defined(PIPE_GENERATION) */



#if !defined(__ISP) && !defined(__SP)

#if !defined(__ISP)

/*

 * For SP and ISP, SDK provides the definition of OP_std_modadd.

 * We need it only for host

 */

#define OP_std_modadd(base, offset, size) ((base+offset)%(size))

#endif /* !defined(__ISP) && !defined(__SP) */

#endif /* !defined(__ISP) */



#if !defined(__KERNEL__)

#define clamp(a, min_val, max_val) MIN(MAX((a), (min_val)), (max_val))

drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_acc_types.h

+2 −2
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ struct ia_css_sp_info { 
   issue with the firmware struct/union's.

   More permanent solution will be to refactor this include.

*/

#if !defined(__ISP) && !defined(__SP)

#if !defined(__ISP)

/** Accelerator firmware information.

 */

struct ia_css_acc_info {
@@ -458,7 +458,7 @@ struct ia_css_acc_fw { 
#define IA_CSS_EXT_ISP_MEM_OFFSETS(f) \

	((const struct ia_css_memory_offsets *)((const char *)(f)+(f)->blob.mem_offsets))



#endif /* !defined(__ISP) && !defined(__SP) */

#endif /* !defined(__ISP) */



enum ia_css_sp_sleep_mode {

	SP_DISABLE_SLEEP_MODE = 0,

drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_buffer.h

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ enum ia_css_buffer_type { 
};



/* Driver API is not SP/ISP visible, 64 bit types not supported on hivecc */

#if !defined(__SP) && !defined(__ISP)

#if !defined(__ISP)

/** Buffer structure. This is a container structure that enables content

 *  independent buffer queues and access functions.

 */
@@ -80,6 +80,6 @@ struct ia_css_buffer { 
void

ia_css_dequeue_param_buffers(void);



#endif /* !__SP && !__ISP */

#endif /* !__ISP */



#endif /* __IA_CSS_BUFFER_H */