Commit 203ef345 authored by Aakarsh Jain's avatar Aakarsh Jain Committed by Mauro Carvalho Chehab

media: s5p-mfc:fix usage of Block comment alignment

Fix usage of block comment alignment in drivers/media/platform/samsung/
s5p-mfc/s5p_mfc.c as recommended by scripts/checkpatch.pl.
Signed-off-by: default avatarAakarsh Jain <aakarsh.jain@samsung.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 40928aea
...@@ -148,11 +148,13 @@ static void s5p_mfc_watchdog(struct timer_list *t) ...@@ -148,11 +148,13 @@ static void s5p_mfc_watchdog(struct timer_list *t)
if (test_bit(0, &dev->hw_lock)) if (test_bit(0, &dev->hw_lock))
atomic_inc(&dev->watchdog_cnt); atomic_inc(&dev->watchdog_cnt);
if (atomic_read(&dev->watchdog_cnt) >= MFC_WATCHDOG_CNT) { if (atomic_read(&dev->watchdog_cnt) >= MFC_WATCHDOG_CNT) {
/* This means that hw is busy and no interrupts were /*
* This means that hw is busy and no interrupts were
* generated by hw for the Nth time of running this * generated by hw for the Nth time of running this
* watchdog timer. This usually means a serious hw * watchdog timer. This usually means a serious hw
* error. Now it is time to kill all instances and * error. Now it is time to kill all instances and
* reset the MFC. */ * reset the MFC.
*/
mfc_err("Time out during waiting for HW\n"); mfc_err("Time out during waiting for HW\n");
schedule_work(&dev->watchdog_work); schedule_work(&dev->watchdog_work);
} }
...@@ -172,8 +174,10 @@ static void s5p_mfc_watchdog_worker(struct work_struct *work) ...@@ -172,8 +174,10 @@ static void s5p_mfc_watchdog_worker(struct work_struct *work)
dev = container_of(work, struct s5p_mfc_dev, watchdog_work); dev = container_of(work, struct s5p_mfc_dev, watchdog_work);
mfc_err("Driver timeout error handling\n"); mfc_err("Driver timeout error handling\n");
/* Lock the mutex that protects open and release. /*
* This is necessary as they may load and unload firmware. */ * Lock the mutex that protects open and release.
* This is necessary as they may load and unload firmware.
*/
mutex_locked = mutex_trylock(&dev->mfc_mutex); mutex_locked = mutex_trylock(&dev->mfc_mutex);
if (!mutex_locked) if (!mutex_locked)
mfc_err("Error: some instance may be closing/opening\n"); mfc_err("Error: some instance may be closing/opening\n");
...@@ -197,8 +201,10 @@ static void s5p_mfc_watchdog_worker(struct work_struct *work) ...@@ -197,8 +201,10 @@ static void s5p_mfc_watchdog_worker(struct work_struct *work)
/* De-init MFC */ /* De-init MFC */
s5p_mfc_deinit_hw(dev); s5p_mfc_deinit_hw(dev);
/* Double check if there is at least one instance running. /*
* If no instance is in memory than no firmware should be present */ * Double check if there is at least one instance running.
* If no instance is in memory than no firmware should be present
*/
if (dev->num_inst > 0) { if (dev->num_inst > 0) {
ret = s5p_mfc_load_firmware(dev); ret = s5p_mfc_load_firmware(dev);
if (ret) { if (ret) {
...@@ -260,8 +266,10 @@ static void s5p_mfc_handle_frame_copy_time(struct s5p_mfc_ctx *ctx) ...@@ -260,8 +266,10 @@ static void s5p_mfc_handle_frame_copy_time(struct s5p_mfc_ctx *ctx)
return; return;
dec_y_addr = (u32)s5p_mfc_hw_call(dev->mfc_ops, get_dec_y_adr, dev); dec_y_addr = (u32)s5p_mfc_hw_call(dev->mfc_ops, get_dec_y_adr, dev);
/* Copy timestamp / timecode from decoded src to dst and set /*
appropriate flags. */ * Copy timestamp / timecode from decoded src to dst and set
* appropriate flags.
*/
src_buf = list_entry(ctx->src_queue.next, struct s5p_mfc_buf, list); src_buf = list_entry(ctx->src_queue.next, struct s5p_mfc_buf, list);
list_for_each_entry(dst_buf, &ctx->dst_queue, list) { list_for_each_entry(dst_buf, &ctx->dst_queue, list) {
u32 addr = (u32)vb2_dma_contig_plane_dma_addr(&dst_buf->b->vb2_buf, 0); u32 addr = (u32)vb2_dma_contig_plane_dma_addr(&dst_buf->b->vb2_buf, 0);
...@@ -289,8 +297,10 @@ static void s5p_mfc_handle_frame_copy_time(struct s5p_mfc_ctx *ctx) ...@@ -289,8 +297,10 @@ static void s5p_mfc_handle_frame_copy_time(struct s5p_mfc_ctx *ctx)
V4L2_BUF_FLAG_BFRAME; V4L2_BUF_FLAG_BFRAME;
break; break;
default: default:
/* Don't know how to handle /*
S5P_FIMV_DECODE_FRAME_OTHER_FRAME. */ * Don't know how to handle
* S5P_FIMV_DECODE_FRAME_OTHER_FRAME.
*/
mfc_debug(2, "Unexpected frame type: %d\n", mfc_debug(2, "Unexpected frame type: %d\n",
frame_type); frame_type);
} }
...@@ -322,8 +332,10 @@ static void s5p_mfc_handle_frame_new(struct s5p_mfc_ctx *ctx, unsigned int err) ...@@ -322,8 +332,10 @@ static void s5p_mfc_handle_frame_new(struct s5p_mfc_ctx *ctx, unsigned int err)
return; return;
} }
ctx->sequence++; ctx->sequence++;
/* The MFC returns address of the buffer, now we have to /*
* check which vb2_buffer does it correspond to */ * The MFC returns address of the buffer, now we have to
* check which vb2_buffer does it correspond to
*/
list_for_each_entry(dst_buf, &ctx->dst_queue, list) { list_for_each_entry(dst_buf, &ctx->dst_queue, list) {
u32 addr = (u32)vb2_dma_contig_plane_dma_addr(&dst_buf->b->vb2_buf, 0); u32 addr = (u32)vb2_dma_contig_plane_dma_addr(&dst_buf->b->vb2_buf, 0);
...@@ -476,8 +488,10 @@ static void s5p_mfc_handle_error(struct s5p_mfc_dev *dev, ...@@ -476,8 +488,10 @@ static void s5p_mfc_handle_error(struct s5p_mfc_dev *dev,
case MFCINST_FINISHING: case MFCINST_FINISHING:
case MFCINST_FINISHED: case MFCINST_FINISHED:
case MFCINST_RUNNING: case MFCINST_RUNNING:
/* It is highly probable that an error occurred /*
* while decoding a frame */ * It is highly probable that an error occurred
* while decoding a frame
*/
clear_work_bit(ctx); clear_work_bit(ctx);
ctx->state = MFCINST_ERROR; ctx->state = MFCINST_ERROR;
/* Mark all dst buffers as having an error */ /* Mark all dst buffers as having an error */
...@@ -535,6 +549,7 @@ static void s5p_mfc_handle_seq_done(struct s5p_mfc_ctx *ctx, ...@@ -535,6 +549,7 @@ static void s5p_mfc_handle_seq_done(struct s5p_mfc_ctx *ctx,
ctx->codec_mode == S5P_MFC_CODEC_H264_MVC_DEC) && ctx->codec_mode == S5P_MFC_CODEC_H264_MVC_DEC) &&
!list_empty(&ctx->src_queue)) { !list_empty(&ctx->src_queue)) {
struct s5p_mfc_buf *src_buf; struct s5p_mfc_buf *src_buf;
src_buf = list_entry(ctx->src_queue.next, src_buf = list_entry(ctx->src_queue.next,
struct s5p_mfc_buf, list); struct s5p_mfc_buf, list);
if (s5p_mfc_hw_call(dev->mfc_ops, get_consumed_stream, if (s5p_mfc_hw_call(dev->mfc_ops, get_consumed_stream,
...@@ -951,7 +966,7 @@ static int s5p_mfc_release(struct file *file) ...@@ -951,7 +966,7 @@ static int s5p_mfc_release(struct file *file)
/* /*
* If instance was initialised and not yet freed, * If instance was initialised and not yet freed,
* return instance and free resources * return instance and free resources
*/ */
if (ctx->state != MFCINST_FREE && ctx->state != MFCINST_INIT) { if (ctx->state != MFCINST_FREE && ctx->state != MFCINST_INIT) {
mfc_debug(2, "Has to free instance\n"); mfc_debug(2, "Has to free instance\n");
s5p_mfc_close_mfc_inst(dev, ctx); s5p_mfc_close_mfc_inst(dev, ctx);
...@@ -1318,7 +1333,7 @@ static int s5p_mfc_probe(struct platform_device *pdev) ...@@ -1318,7 +1333,7 @@ static int s5p_mfc_probe(struct platform_device *pdev)
/* /*
* Load fails if fs isn't mounted. Try loading anyway. * Load fails if fs isn't mounted. Try loading anyway.
* _open() will load it, it it fails now. Ignore failure. * _open() will load it, it fails now. Ignore failure.
*/ */
s5p_mfc_load_firmware(dev); s5p_mfc_load_firmware(dev);
...@@ -1429,7 +1444,7 @@ static int s5p_mfc_remove(struct platform_device *pdev) ...@@ -1429,7 +1444,7 @@ static int s5p_mfc_remove(struct platform_device *pdev)
* Clear ctx dev pointer to avoid races between s5p_mfc_remove() * Clear ctx dev pointer to avoid races between s5p_mfc_remove()
* and s5p_mfc_release() and s5p_mfc_release() accessing ctx->dev * and s5p_mfc_release() and s5p_mfc_release() accessing ctx->dev
* after s5p_mfc_remove() is run during unbind. * after s5p_mfc_remove() is run during unbind.
*/ */
mutex_lock(&dev->mfc_mutex); mutex_lock(&dev->mfc_mutex);
for (i = 0; i < MFC_NUM_CONTEXTS; i++) { for (i = 0; i < MFC_NUM_CONTEXTS; i++) {
ctx = dev->ctx[i]; ctx = dev->ctx[i];
......
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