tdm_exynos_sc_v4l2: do not checking null 99/209599/1
authorJunkyeong Kim <jk0430.kim@samsung.com>
Tue, 9 Jul 2019 08:09:22 +0000 (17:09 +0900)
committerJunkyeong Kim <jk0430.kim@samsung.com>
Tue, 9 Jul 2019 08:09:27 +0000 (17:09 +0900)
the pointers are never null.

Change-Id: I49c33545ffc6cff3f3d290832f106a875f569209
Signed-off-by: Junkyeong Kim <jk0430.kim@samsung.com>
src/tdm_exynos_sc_v4l2.c

index dcff61cd3364b3c0fff02bc3dd94a4782d0bf2b8..bda87c0d4bbbe6b9eda55a662b3883590eb78bd8 100644 (file)
@@ -1020,8 +1020,8 @@ exynos_pp_v4l2_set_info(tdm_pp *pp, tdm_info_pp *info)
                                        done_task->buffers[done_task->max_step-1].dst,
                                        done_task->done_user_data);
                }
-               if (done_task)
-                       _tdm_exynos_pp_v4l2_destroy_task(pp_v4l2_data, done_task);
+
+               _tdm_exynos_pp_v4l2_destroy_task(pp_v4l2_data, done_task);
        }
 
        /* pending task list handling */
@@ -1030,39 +1030,37 @@ exynos_pp_v4l2_set_info(tdm_pp *pp, tdm_info_pp *info)
                next_task = (tdm_exynos_pp_v4l2_task *)container_of(pp_v4l2_data->pending_tasks_list.next, next_task, link);
                LIST_DEL(&next_task->link);
 
-               if (next_task) {
-                       /* qbuf */
-                       TDM_DBG("pp %p(%d). Task %p(%d) setup next step %d of %d",
-                                       pp_v4l2_data, pp_v4l2_data->stamp, next_task, next_task->stamp,
-                                       next_task->current_step+1, next_task->max_step);
-                       if (_tdm_exynos_pp_v4l2_queue(pp_v4l2_data, next_task->prop_id[next_task->current_step],
-                                               next_task->buffers[next_task->current_step].src,
-                                               next_task->buffers[next_task->current_step].dst,
-                                               PP_BUF_ENQUEUE) != TDM_ERROR_NONE) {
-                               return TDM_ERROR_OPERATION_FAILED;
-                       }
-                       next_task->status = TASK_CONVERTING;
-                       pp_v4l2_data->current_task_p = next_task;
+               /* qbuf */
+               TDM_DBG("pp %p(%d). Task %p(%d) setup next step %d of %d",
+                               pp_v4l2_data, pp_v4l2_data->stamp, next_task, next_task->stamp,
+                               next_task->current_step+1, next_task->max_step);
+               if (_tdm_exynos_pp_v4l2_queue(pp_v4l2_data, next_task->prop_id[next_task->current_step],
+                                       next_task->buffers[next_task->current_step].src,
+                                       next_task->buffers[next_task->current_step].dst,
+                                       PP_BUF_ENQUEUE) != TDM_ERROR_NONE) {
+                       return TDM_ERROR_OPERATION_FAILED;
+               }
+               next_task->status = TASK_CONVERTING;
+               pp_v4l2_data->current_task_p = next_task;
 
-                       /* dqbuf */
-                       done_task = pp_v4l2_data->current_task_p;
-                       int prop_id = done_task->prop_id[done_task->current_step];
-                       int idx = prop_id - 1;
-                       _tdm_exynos_pp_v4l2_queue(pp_v4l2_data, prop_id, done_task->buffers[idx].src, done_task->buffers[idx].dst, PP_BUF_DEQUEUE);
-                       pp_v4l2_data->current_task_p->status = TASK_DONE;
+               /* dqbuf */
+               done_task = pp_v4l2_data->current_task_p;
+               int prop_id = done_task->prop_id[done_task->current_step];
+               int idx = prop_id - 1;
+               _tdm_exynos_pp_v4l2_queue(pp_v4l2_data, prop_id, done_task->buffers[idx].src, done_task->buffers[idx].dst, PP_BUF_DEQUEUE);
+               pp_v4l2_data->current_task_p->status = TASK_DONE;
 
-                       /* double operation */
+               /* double operation */
 
-                       /* buffer release */
-                       pp_v4l2_data->current_task_p = NULL;
-                       if (done_task->done_func) {
-                               done_task->done_func(pp_v4l2_data, done_task->buffers[0].src,
-                                               done_task->buffers[done_task->max_step-1].dst,
-                                               done_task->done_user_data);
-                       }
-                       if (done_task)
-                               _tdm_exynos_pp_v4l2_destroy_task(pp_v4l2_data, done_task);
+               /* buffer release */
+               pp_v4l2_data->current_task_p = NULL;
+               if (done_task->done_func) {
+                       done_task->done_func(pp_v4l2_data, done_task->buffers[0].src,
+                                       done_task->buffers[done_task->max_step-1].dst,
+                                       done_task->done_user_data);
                }
+
+               _tdm_exynos_pp_v4l2_destroy_task(pp_v4l2_data, done_task);
        }
 
        /* Stream OFF */
@@ -1240,8 +1238,8 @@ exynos_pp_v4l2_commit(tdm_pp *pp)
                                                done_task->buffers[done_task->max_step-1].dst,
                                                done_task->done_user_data);
                        }
-                       if (done_task)
-                               _tdm_exynos_pp_v4l2_destroy_task(pp_v4l2_data, done_task);
+
+                       _tdm_exynos_pp_v4l2_destroy_task(pp_v4l2_data, done_task);
                }
        } else {
                /* error case (attach->commit->commit(error)) */