diff options
| author | Alan Cox | 2017-03-10 12:34:11 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2017-03-12 14:48:20 +0100 |
| commit | 5ac0a3447a3192f4664b9af4c28b24c634f0be21 (patch) | |
| tree | 107569f773c8e9a3f2001fbd297a12ef18f2a0a3 /drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime | |
| parent | atomisp: remove HIVECC (diff) | |
| download | kernel-qcow2-linux-5ac0a3447a3192f4664b9af4c28b24c634f0be21.tar.gz kernel-qcow2-linux-5ac0a3447a3192f4664b9af4c28b24c634f0be21.tar.xz kernel-qcow2-linux-5ac0a3447a3192f4664b9af4c28b24c634f0be21.zip | |
atomisp: remove C_RUN define and code
We are not going to be building for anything but Linux so the code bracketed
by C_RUN is not used and not needed.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime')
3 files changed, 3 insertions, 7 deletions
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/bufq/src/bufq.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/bufq/src/bufq.c index 30a329022a2b..737ad66da900 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/bufq/src/bufq.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/bufq/src/bufq.c @@ -290,11 +290,7 @@ init_bufq(unsigned int desc_offset, ia_css_queue_remote_t remoteq; fw = &sh_css_sp_fw; -#ifdef C_RUN - q_base_addr = (unsigned int)sp_address_of(ia_css_bufq_host_sp_queue); -#else q_base_addr = fw->info.sp.host_sp_queue; -#endif /* Setup queue location as SP and proc id as SP0_ID */ remoteq.location = IA_CSS_QUEUE_LOC_SP; diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/src/ia_css_debug.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/src/ia_css_debug.c index bb89c310780b..82b359304932 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/src/ia_css_debug.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/src/ia_css_debug.c @@ -177,7 +177,7 @@ void ia_css_debug_dtrace(unsigned int level, const char *fmt, ...) va_end(ap); } -#if !defined(C_RUN) && !defined(HRT_UNSCHED) +#if !defined(HRT_UNSCHED) static void debug_dump_long_array_formatted( const sp_ID_t sp_id, hrt_address stack_sp_addr, @@ -255,7 +255,7 @@ void ia_css_debug_dump_sp_stack_info(void) void ia_css_debug_dump_sp_stack_info(void) { } -#endif /* #if !C_RUN && !HRT_UNSCHED */ +#endif /* #if !HRT_UNSCHED */ void ia_css_debug_set_dtrace_level(const unsigned int trace_level) diff --git a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/spctrl/src/spctrl.c b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/spctrl/src/spctrl.c index 0962a4bc3f32..0d2e47d9f709 100644 --- a/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/spctrl/src/spctrl.c +++ b/drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/spctrl/src/spctrl.c @@ -62,7 +62,7 @@ enum ia_css_err ia_css_spctrl_load_fw(sp_ID_t sp_id, spctrl_cofig_info[sp_id].code_addr = mmgr_NULL; -#if defined(C_RUN) || defined(HRT_UNSCHED) +#if defined(HRT_UNSCHED) (void)init_dmem_cfg; code_addr = mmgr_malloc(1); if (code_addr == mmgr_NULL) |