Commit 149e31e9 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab

media: v4l: rcar_fdp1: Fix indentation oddities

Indentation is odd in several places, especially when printing messages
to the kernel log. Fix it to match the usual coding style.
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: default avatarKieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 35e2e8b5
...@@ -945,7 +945,7 @@ static void fdp1_configure_wpf(struct fdp1_ctx *ctx, ...@@ -945,7 +945,7 @@ static void fdp1_configure_wpf(struct fdp1_ctx *ctx,
u32 rndctl; u32 rndctl;
pstride = q_data->format.plane_fmt[0].bytesperline pstride = q_data->format.plane_fmt[0].bytesperline
<< FD1_WPF_PSTRIDE_Y_SHIFT; << FD1_WPF_PSTRIDE_Y_SHIFT;
if (q_data->format.num_planes > 1) if (q_data->format.num_planes > 1)
pstride |= q_data->format.plane_fmt[1].bytesperline pstride |= q_data->format.plane_fmt[1].bytesperline
...@@ -1139,8 +1139,8 @@ static int fdp1_m2m_job_ready(void *priv) ...@@ -1139,8 +1139,8 @@ static int fdp1_m2m_job_ready(void *priv)
int dstbufs = 1; int dstbufs = 1;
dprintk(ctx->fdp1, "+ Src: %d : Dst: %d\n", dprintk(ctx->fdp1, "+ Src: %d : Dst: %d\n",
v4l2_m2m_num_src_bufs_ready(ctx->fh.m2m_ctx), v4l2_m2m_num_src_bufs_ready(ctx->fh.m2m_ctx),
v4l2_m2m_num_dst_bufs_ready(ctx->fh.m2m_ctx)); v4l2_m2m_num_dst_bufs_ready(ctx->fh.m2m_ctx));
/* One output buffer is required for each field */ /* One output buffer is required for each field */
if (V4L2_FIELD_HAS_BOTH(src_q_data->format.field)) if (V4L2_FIELD_HAS_BOTH(src_q_data->format.field))
...@@ -1278,7 +1278,7 @@ static void fdp1_m2m_device_run(void *priv) ...@@ -1278,7 +1278,7 @@ static void fdp1_m2m_device_run(void *priv)
fdp1_queue_field(ctx, fbuf); fdp1_queue_field(ctx, fbuf);
dprintk(fdp1, "Queued Buffer [%d] last_field:%d\n", dprintk(fdp1, "Queued Buffer [%d] last_field:%d\n",
i, fbuf->last_field); i, fbuf->last_field);
} }
/* Queue as many jobs as our data provides for */ /* Queue as many jobs as our data provides for */
...@@ -1337,7 +1337,7 @@ static void device_frame_end(struct fdp1_dev *fdp1, ...@@ -1337,7 +1337,7 @@ static void device_frame_end(struct fdp1_dev *fdp1,
fdp1_job_free(fdp1, job); fdp1_job_free(fdp1, job);
dprintk(fdp1, "curr_ctx->num_processed %d curr_ctx->translen %d\n", dprintk(fdp1, "curr_ctx->num_processed %d curr_ctx->translen %d\n",
ctx->num_processed, ctx->translen); ctx->num_processed, ctx->translen);
if (ctx->num_processed == ctx->translen || if (ctx->num_processed == ctx->translen ||
ctx->aborting) { ctx->aborting) {
...@@ -1362,7 +1362,7 @@ static int fdp1_vidioc_querycap(struct file *file, void *priv, ...@@ -1362,7 +1362,7 @@ static int fdp1_vidioc_querycap(struct file *file, void *priv,
strscpy(cap->driver, DRIVER_NAME, sizeof(cap->driver)); strscpy(cap->driver, DRIVER_NAME, sizeof(cap->driver));
strscpy(cap->card, DRIVER_NAME, sizeof(cap->card)); strscpy(cap->card, DRIVER_NAME, sizeof(cap->card));
snprintf(cap->bus_info, sizeof(cap->bus_info), snprintf(cap->bus_info, sizeof(cap->bus_info),
"platform:%s", DRIVER_NAME); "platform:%s", DRIVER_NAME);
return 0; return 0;
} }
...@@ -1993,13 +1993,13 @@ static void fdp1_stop_streaming(struct vb2_queue *q) ...@@ -1993,13 +1993,13 @@ static void fdp1_stop_streaming(struct vb2_queue *q)
/* Free smsk_data */ /* Free smsk_data */
if (ctx->smsk_cpu) { if (ctx->smsk_cpu) {
dma_free_coherent(ctx->fdp1->dev, ctx->smsk_size, dma_free_coherent(ctx->fdp1->dev, ctx->smsk_size,
ctx->smsk_cpu, ctx->smsk_addr[0]); ctx->smsk_cpu, ctx->smsk_addr[0]);
ctx->smsk_addr[0] = ctx->smsk_addr[1] = 0; ctx->smsk_addr[0] = ctx->smsk_addr[1] = 0;
ctx->smsk_cpu = NULL; ctx->smsk_cpu = NULL;
} }
WARN(!list_empty(&ctx->fields_queue), WARN(!list_empty(&ctx->fields_queue),
"Buffer queue not empty"); "Buffer queue not empty");
} else { } else {
/* Empty Capture queues (Jobs) */ /* Empty Capture queues (Jobs) */
struct fdp1_job *job; struct fdp1_job *job;
...@@ -2021,10 +2021,10 @@ static void fdp1_stop_streaming(struct vb2_queue *q) ...@@ -2021,10 +2021,10 @@ static void fdp1_stop_streaming(struct vb2_queue *q)
fdp1_field_complete(ctx, ctx->previous); fdp1_field_complete(ctx, ctx->previous);
WARN(!list_empty(&ctx->fdp1->queued_job_list), WARN(!list_empty(&ctx->fdp1->queued_job_list),
"Queued Job List not empty"); "Queued Job List not empty");
WARN(!list_empty(&ctx->fdp1->hw_job_list), WARN(!list_empty(&ctx->fdp1->hw_job_list),
"HW Job list not empty"); "HW Job list not empty");
} }
} }
...@@ -2110,7 +2110,7 @@ static int fdp1_open(struct file *file) ...@@ -2110,7 +2110,7 @@ static int fdp1_open(struct file *file)
fdp1_ctrl_deint_menu); fdp1_ctrl_deint_menu);
ctrl = v4l2_ctrl_new_std(&ctx->hdl, &fdp1_ctrl_ops, ctrl = v4l2_ctrl_new_std(&ctx->hdl, &fdp1_ctrl_ops,
V4L2_CID_MIN_BUFFERS_FOR_CAPTURE, 1, 2, 1, 1); V4L2_CID_MIN_BUFFERS_FOR_CAPTURE, 1, 2, 1, 1);
if (ctrl) if (ctrl)
ctrl->flags |= V4L2_CTRL_FLAG_VOLATILE; ctrl->flags |= V4L2_CTRL_FLAG_VOLATILE;
...@@ -2347,8 +2347,8 @@ static int fdp1_probe(struct platform_device *pdev) ...@@ -2347,8 +2347,8 @@ static int fdp1_probe(struct platform_device *pdev)
goto release_m2m; goto release_m2m;
} }
v4l2_info(&fdp1->v4l2_dev, v4l2_info(&fdp1->v4l2_dev, "Device registered as /dev/video%d\n",
"Device registered as /dev/video%d\n", vfd->num); vfd->num);
/* Power up the cells to read HW */ /* Power up the cells to read HW */
pm_runtime_enable(&pdev->dev); pm_runtime_enable(&pdev->dev);
...@@ -2367,7 +2367,7 @@ static int fdp1_probe(struct platform_device *pdev) ...@@ -2367,7 +2367,7 @@ static int fdp1_probe(struct platform_device *pdev)
break; break;
default: default:
dev_err(fdp1->dev, "FDP1 Unidentifiable (0x%08x)\n", dev_err(fdp1->dev, "FDP1 Unidentifiable (0x%08x)\n",
hw_version); hw_version);
} }
/* Allow the hw to sleep until an open call puts it to use */ /* Allow the hw to sleep until an open call puts it to use */
......
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