iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[media] atomisp2: tidy up confused ifdefs

Browse Source 
The two drivers were machine merged and in this case the machine output was to
say the least not optimal.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Alan Cox 2017-05-26 12:27:54 -03:00 committed by Mauro Carvalho Chehab
parent f16595ae20
commit 94e23b6148
1 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c
View File

@ -1469,30 +1469,17 @@ static void start_pipe(
copy_ovrd, copy_ovrd,
input_mode, input_mode,
&me->stream->config.metadata_config, &me->stream->config.metadata_config,
#ifndef ISP2401
&me->stream->info.metadata_info &me->stream->info.metadata_info
#else
&me->stream->info.metadata_info,
#endif
#if !defined(HAS_NO_INPUT_SYSTEM) #if !defined(HAS_NO_INPUT_SYSTEM)
#ifndef ISP2401 ,(input_mode==IA_CSS_INPUT_MODE_MEMORY) ?
, (input_mode==IA_CSS_INPUT_MODE_MEMORY)?
#else
(input_mode == IA_CSS_INPUT_MODE_MEMORY) ?
#endif
(mipi_port_ID_t)0 : (mipi_port_ID_t)0 :
#ifndef ISP2401
me->stream->config.source.port.port me->stream->config.source.port.port
#else
me->stream->config.source.port.port,
#endif #endif
#ifdef ISP2401
,&me->config.internal_frame_origin_bqs_on_sctbl,
me->stream->isp_params_configs
#endif #endif
#ifndef ISP2401 );
);
#else
&me->config.internal_frame_origin_bqs_on_sctbl,
me->stream->isp_params_configs);
#endif
if (me->config.mode != IA_CSS_PIPE_MODE_COPY) { if (me->config.mode != IA_CSS_PIPE_MODE_COPY) {
struct ia_css_pipeline_stage *stage; struct ia_css_pipeline_stage *stage;
@ -9815,9 +9802,6 @@ ia_css_stream_create(const struct ia_css_stream_config *stream_config,
/* take over effective info */ /* take over effective info */
effective_res = curr_pipe->config.input_effective_res; effective_res = curr_pipe->config.input_effective_res;
#endif
#ifndef ISP2401
err = ia_css_util_check_res( err = ia_css_util_check_res(
effective_res.width, effective_res.width,
effective_res.height); effective_res.height);