Commit b5eb7ac1 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

media: atomisp: fix spatch warnings at sh_css.c

drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c:5801:1: error: directive in argument list
drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c:5803:1: error: directive in argument list
drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c:3795 create_host_acc_pipeline() warn: inconsistent indenting
drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c:4343 ia_css_pipe_enqueue_buffer() warn: inconsistent indenting
drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c:6029 sh_css_pipe_configure_viewfinder() warn: inconsistent indenting
drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c:8693 ia_css_stream_capture() warn: inconsistent indenting
drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c:9781 ia_css_stream_create() warn: if statement not indented
drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c:9988 ia_css_stream_load() warn: inconsistent indenting
drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c:10525 ia_css_update_continuous_frames() warn: inconsistent indenting
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@iki.fi>
parent 130b31ec
...@@ -3779,6 +3779,7 @@ static enum ia_css_err ...@@ -3779,6 +3779,7 @@ static enum ia_css_err
create_host_acc_pipeline(struct ia_css_pipe *pipe) create_host_acc_pipeline(struct ia_css_pipe *pipe)
{ {
enum ia_css_err err = IA_CSS_SUCCESS; enum ia_css_err err = IA_CSS_SUCCESS;
const struct ia_css_fw_info *fw;
unsigned int i; unsigned int i;
IA_CSS_ENTER_PRIVATE("pipe = %p", pipe); IA_CSS_ENTER_PRIVATE("pipe = %p", pipe);
...@@ -3792,14 +3793,12 @@ create_host_acc_pipeline(struct ia_css_pipe *pipe) ...@@ -3792,14 +3793,12 @@ create_host_acc_pipeline(struct ia_css_pipe *pipe)
if (pipe->config.acc_extension) if (pipe->config.acc_extension)
pipe->pipeline.pipe_qos_config = 0; pipe->pipeline.pipe_qos_config = 0;
{ fw = pipe->vf_stage;
const struct ia_css_fw_info *fw = pipe->vf_stage;
for (i = 0; fw; fw = fw->next){ for (i = 0; fw; fw = fw->next){
err = sh_css_pipeline_add_acc_stage(&pipe->pipeline, fw); err = sh_css_pipeline_add_acc_stage(&pipe->pipeline, fw);
if (err != IA_CSS_SUCCESS) if (err != IA_CSS_SUCCESS)
goto ERR; goto ERR;
} }
}
for (i=0; i<pipe->config.num_acc_stages; i++) { for (i=0; i<pipe->config.num_acc_stages; i++) {
struct ia_css_fw_info *fw = pipe->config.acc_stages[i]; struct ia_css_fw_info *fw = pipe->config.acc_stages[i];
...@@ -4336,6 +4335,7 @@ ia_css_pipe_enqueue_buffer(struct ia_css_pipe *pipe, ...@@ -4336,6 +4335,7 @@ ia_css_pipe_enqueue_buffer(struct ia_css_pipe *pipe,
|| (buf_type == IA_CSS_BUFFER_TYPE_SEC_OUTPUT_FRAME) || (buf_type == IA_CSS_BUFFER_TYPE_SEC_OUTPUT_FRAME)
|| (buf_type == IA_CSS_BUFFER_TYPE_SEC_VF_OUTPUT_FRAME) || (buf_type == IA_CSS_BUFFER_TYPE_SEC_VF_OUTPUT_FRAME)
|| (buf_type == IA_CSS_BUFFER_TYPE_METADATA)) { || (buf_type == IA_CSS_BUFFER_TYPE_METADATA)) {
return_err = ia_css_bufq_enqueue_buffer(thread_id, return_err = ia_css_bufq_enqueue_buffer(thread_id,
queue_id, queue_id,
(uint32_t)h_vbuf->vptr); (uint32_t)h_vbuf->vptr);
...@@ -5795,13 +5795,15 @@ static enum ia_css_err load_video_binaries(struct ia_css_pipe *pipe) ...@@ -5795,13 +5795,15 @@ static enum ia_css_err load_video_binaries(struct ia_css_pipe *pipe)
#endif #endif
/* Make tnr reference buffers output block height align */ /* Make tnr reference buffers output block height align */
tnr_info.res.height =
#ifndef ISP2401 #ifndef ISP2401
tnr_info.res.height =
CEIL_MUL(tnr_info.res.height, CEIL_MUL(tnr_info.res.height,
mycs->video_binary.info->sp.block.output_block_height);
#else #else
tnr_info.res.height =
CEIL_MUL(tnr_height, CEIL_MUL(tnr_height,
#endif
mycs->video_binary.info->sp.block.output_block_height); mycs->video_binary.info->sp.block.output_block_height);
#endif
} else { } else {
tnr_info = mycs->video_binary.internal_frame_info; tnr_info = mycs->video_binary.internal_frame_info;
} }
...@@ -9778,23 +9780,22 @@ ia_css_stream_create(const struct ia_css_stream_config *stream_config, ...@@ -9778,23 +9780,22 @@ ia_css_stream_create(const struct ia_css_stream_config *stream_config,
if (err == IA_CSS_SUCCESS) if (err == IA_CSS_SUCCESS)
{ {
/* working mode: enter into the seed list */ /* working mode: enter into the seed list */
if (my_css_save.mode == sh_css_mode_working) if (my_css_save.mode == sh_css_mode_working) {
for(i = 0; i < MAX_ACTIVE_STREAMS; i++) for (i = 0; i < MAX_ACTIVE_STREAMS; i++)
if (my_css_save.stream_seeds[i].stream == NULL) if (!my_css_save.stream_seeds[i].stream) {
{
IA_CSS_LOG("entered stream into loc=%d", i); IA_CSS_LOG("entered stream into loc=%d", i);
my_css_save.stream_seeds[i].orig_stream = stream; my_css_save.stream_seeds[i].orig_stream = stream;
my_css_save.stream_seeds[i].stream = curr_stream; my_css_save.stream_seeds[i].stream = curr_stream;
my_css_save.stream_seeds[i].num_pipes = num_pipes; my_css_save.stream_seeds[i].num_pipes = num_pipes;
my_css_save.stream_seeds[i].stream_config = *stream_config; my_css_save.stream_seeds[i].stream_config = *stream_config;
for(j = 0; j < num_pipes; j++) for (j = 0; j < num_pipes; j++) {
{
my_css_save.stream_seeds[i].pipe_config[j] = pipes[j]->config; my_css_save.stream_seeds[i].pipe_config[j] = pipes[j]->config;
my_css_save.stream_seeds[i].pipes[j] = pipes[j]; my_css_save.stream_seeds[i].pipes[j] = pipes[j];
my_css_save.stream_seeds[i].orig_pipes[j] = &pipes[j]; my_css_save.stream_seeds[i].orig_pipes[j] = &pipes[j];
} }
break; break;
} }
}
#else #else
if (err == IA_CSS_SUCCESS) { if (err == IA_CSS_SUCCESS) {
err = ia_css_save_stream(curr_stream); err = ia_css_save_stream(curr_stream);
...@@ -9968,32 +9969,32 @@ ia_css_stream_load(struct ia_css_stream *stream) ...@@ -9968,32 +9969,32 @@ ia_css_stream_load(struct ia_css_stream *stream)
enum ia_css_err err; enum ia_css_err err;
assert(stream != NULL); assert(stream != NULL);
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "ia_css_stream_load() enter, \n"); ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "ia_css_stream_load() enter, \n");
for(i=0;i<MAX_ACTIVE_STREAMS;i++) for (i = 0; i < MAX_ACTIVE_STREAMS; i++) {
if (my_css_save.stream_seeds[i].stream == stream) if (my_css_save.stream_seeds[i].stream == stream) {
{
int j; int j;
for(j=0;j<my_css_save.stream_seeds[i].num_pipes;j++) for ( j = 0; j < my_css_save.stream_seeds[i].num_pipes; j++) {
if ((err = ia_css_pipe_create(&(my_css_save.stream_seeds[i].pipe_config[j]), &my_css_save.stream_seeds[i].pipes[j])) != IA_CSS_SUCCESS) if ((err = ia_css_pipe_create(&(my_css_save.stream_seeds[i].pipe_config[j]), &my_css_save.stream_seeds[i].pipes[j])) != IA_CSS_SUCCESS) {
{ if (j) {
if (j)
{
int k; int k;
for(k=0;k<j;k++) for(k=0;k<j;k++)
ia_css_pipe_destroy(my_css_save.stream_seeds[i].pipes[k]); ia_css_pipe_destroy(my_css_save.stream_seeds[i].pipes[k]);
} }
return err; return err;
} }
err = ia_css_stream_create(&(my_css_save.stream_seeds[i].stream_config), my_css_save.stream_seeds[i].num_pipes, }
my_css_save.stream_seeds[i].pipes, &(my_css_save.stream_seeds[i].stream)); err = ia_css_stream_create(&(my_css_save.stream_seeds[i].stream_config),
if (err != IA_CSS_SUCCESS) my_css_save.stream_seeds[i].num_pipes,
{ my_css_save.stream_seeds[i].pipes,
&(my_css_save.stream_seeds[i].stream));
if (err != IA_CSS_SUCCESS) {
ia_css_stream_destroy(stream); ia_css_stream_destroy(stream);
for(j=0;j<my_css_save.stream_seeds[i].num_pipes;j++) for (j = 0; j < my_css_save.stream_seeds[i].num_pipes; j++)
ia_css_pipe_destroy(my_css_save.stream_seeds[i].pipes[j]); ia_css_pipe_destroy(my_css_save.stream_seeds[i].pipes[j]);
return err; return err;
} }
break; break;
} }
}
ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "ia_css_stream_load() exit, \n"); ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE, "ia_css_stream_load() exit, \n");
return IA_CSS_SUCCESS; return IA_CSS_SUCCESS;
#else #else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment