diff options
author | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2011-06-10 14:36:59 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-09-06 16:50:05 -0400 |
commit | 0295202ca7b2816ddccae83e6efcf6d24cc243c3 (patch) | |
tree | d6faa93cd93c2fded165ae9e8fb78f81ceea0f67 /drivers/media/video/s5p-fimc/fimc-core.c | |
parent | e1d72f4d521733bbf16cb5ba63683fe4147fa349 (diff) |
[media] s5p-fimc: Use consistent names for the buffer list functions
Also correct and improve *_queue_add/pop functions description.
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/s5p-fimc/fimc-core.c')
-rw-r--r-- | drivers/media/video/s5p-fimc/fimc-core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/s5p-fimc/fimc-core.c b/drivers/media/video/s5p-fimc/fimc-core.c index 10aee626c7c9..33c706985763 100644 --- a/drivers/media/video/s5p-fimc/fimc-core.c +++ b/drivers/media/video/s5p-fimc/fimc-core.c | |||
@@ -338,7 +338,7 @@ void fimc_capture_irq_handler(struct fimc_dev *fimc, bool final) | |||
338 | test_bit(ST_CAPT_RUN, &fimc->state) && final) { | 338 | test_bit(ST_CAPT_RUN, &fimc->state) && final) { |
339 | ktime_get_real_ts(&ts); | 339 | ktime_get_real_ts(&ts); |
340 | 340 | ||
341 | v_buf = active_queue_pop(cap); | 341 | v_buf = fimc_active_queue_pop(cap); |
342 | 342 | ||
343 | tv = &v_buf->vb.v4l2_buf.timestamp; | 343 | tv = &v_buf->vb.v4l2_buf.timestamp; |
344 | tv->tv_sec = ts.tv_sec; | 344 | tv->tv_sec = ts.tv_sec; |
@@ -355,12 +355,12 @@ void fimc_capture_irq_handler(struct fimc_dev *fimc, bool final) | |||
355 | 355 | ||
356 | if (!list_empty(&cap->pending_buf_q)) { | 356 | if (!list_empty(&cap->pending_buf_q)) { |
357 | 357 | ||
358 | v_buf = pending_queue_pop(cap); | 358 | v_buf = fimc_pending_queue_pop(cap); |
359 | fimc_hw_set_output_addr(fimc, &v_buf->paddr, cap->buf_index); | 359 | fimc_hw_set_output_addr(fimc, &v_buf->paddr, cap->buf_index); |
360 | v_buf->index = cap->buf_index; | 360 | v_buf->index = cap->buf_index; |
361 | 361 | ||
362 | /* Move the buffer to the capture active queue */ | 362 | /* Move the buffer to the capture active queue */ |
363 | active_queue_add(cap, v_buf); | 363 | fimc_active_queue_add(cap, v_buf); |
364 | 364 | ||
365 | dbg("next frame: %d, done frame: %d", | 365 | dbg("next frame: %d, done frame: %d", |
366 | fimc_hw_get_frame_index(fimc), v_buf->index); | 366 | fimc_hw_get_frame_index(fimc), v_buf->index); |