aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/platform/s5p-fimc/fimc-core.c4
-rw-r--r--drivers/media/platform/s5p-fimc/fimc-lite.c12
-rw-r--r--drivers/media/platform/s5p-fimc/fimc-mdevice.c4
3 files changed, 10 insertions, 10 deletions
diff --git a/drivers/media/platform/s5p-fimc/fimc-core.c b/drivers/media/platform/s5p-fimc/fimc-core.c
index 92d477c91811..6d5b03a7b5e5 100644
--- a/drivers/media/platform/s5p-fimc/fimc-core.c
+++ b/drivers/media/platform/s5p-fimc/fimc-core.c
@@ -257,14 +257,14 @@ int fimc_set_scaler_info(struct fimc_ctx *ctx)
257 ty = d_frame->height; 257 ty = d_frame->height;
258 } 258 }
259 if (tx <= 0 || ty <= 0) { 259 if (tx <= 0 || ty <= 0) {
260 dev_err(dev, "Invalid target size: %dx%d", tx, ty); 260 dev_err(dev, "Invalid target size: %dx%d\n", tx, ty);
261 return -EINVAL; 261 return -EINVAL;
262 } 262 }
263 263
264 sx = s_frame->width; 264 sx = s_frame->width;
265 sy = s_frame->height; 265 sy = s_frame->height;
266 if (sx <= 0 || sy <= 0) { 266 if (sx <= 0 || sy <= 0) {
267 dev_err(dev, "Invalid source size: %dx%d", sx, sy); 267 dev_err(dev, "Invalid source size: %dx%d\n", sx, sy);
268 return -EINVAL; 268 return -EINVAL;
269 } 269 }
270 sc->real_width = sx; 270 sc->real_width = sx;
diff --git a/drivers/media/platform/s5p-fimc/fimc-lite.c b/drivers/media/platform/s5p-fimc/fimc-lite.c
index ef3989fe63e5..e18babfa89e0 100644
--- a/drivers/media/platform/s5p-fimc/fimc-lite.c
+++ b/drivers/media/platform/s5p-fimc/fimc-lite.c
@@ -611,7 +611,7 @@ static void fimc_lite_try_crop(struct fimc_lite *fimc, struct v4l2_rect *r)
611 r->left = round_down(r->left, fimc->variant->win_hor_offs_align); 611 r->left = round_down(r->left, fimc->variant->win_hor_offs_align);
612 r->top = clamp_t(u32, r->top, 0, frame->f_height - r->height); 612 r->top = clamp_t(u32, r->top, 0, frame->f_height - r->height);
613 613
614 v4l2_dbg(1, debug, &fimc->subdev, "(%d,%d)/%dx%d, sink fmt: %dx%d", 614 v4l2_dbg(1, debug, &fimc->subdev, "(%d,%d)/%dx%d, sink fmt: %dx%d\n",
615 r->left, r->top, r->width, r->height, 615 r->left, r->top, r->width, r->height,
616 frame->f_width, frame->f_height); 616 frame->f_width, frame->f_height);
617} 617}
@@ -631,7 +631,7 @@ static void fimc_lite_try_compose(struct fimc_lite *fimc, struct v4l2_rect *r)
631 r->left = round_down(r->left, fimc->variant->out_hor_offs_align); 631 r->left = round_down(r->left, fimc->variant->out_hor_offs_align);
632 r->top = clamp_t(u32, r->top, 0, fimc->out_frame.f_height - r->height); 632 r->top = clamp_t(u32, r->top, 0, fimc->out_frame.f_height - r->height);
633 633
634 v4l2_dbg(1, debug, &fimc->subdev, "(%d,%d)/%dx%d, source fmt: %dx%d", 634 v4l2_dbg(1, debug, &fimc->subdev, "(%d,%d)/%dx%d, source fmt: %dx%d\n",
635 r->left, r->top, r->width, r->height, 635 r->left, r->top, r->width, r->height,
636 frame->f_width, frame->f_height); 636 frame->f_width, frame->f_height);
637} 637}
@@ -1011,7 +1011,7 @@ static int fimc_lite_link_setup(struct media_entity *entity,
1011 if (WARN_ON(fimc == NULL)) 1011 if (WARN_ON(fimc == NULL))
1012 return 0; 1012 return 0;
1013 1013
1014 v4l2_dbg(1, debug, sd, "%s: %s --> %s, flags: 0x%x. source_id: 0x%x", 1014 v4l2_dbg(1, debug, sd, "%s: %s --> %s, flags: 0x%x. source_id: 0x%x\n",
1015 __func__, remote->entity->name, local->entity->name, 1015 __func__, remote->entity->name, local->entity->name,
1016 flags, fimc->source_subdev_grp_id); 1016 flags, fimc->source_subdev_grp_id);
1017 1017
@@ -1120,7 +1120,7 @@ static int fimc_lite_subdev_set_fmt(struct v4l2_subdev *sd,
1120 struct flite_frame *source = &fimc->out_frame; 1120 struct flite_frame *source = &fimc->out_frame;
1121 const struct fimc_fmt *ffmt; 1121 const struct fimc_fmt *ffmt;
1122 1122
1123 v4l2_dbg(1, debug, sd, "pad%d: code: 0x%x, %dx%d", 1123 v4l2_dbg(1, debug, sd, "pad%d: code: 0x%x, %dx%d\n",
1124 fmt->pad, mf->code, mf->width, mf->height); 1124 fmt->pad, mf->code, mf->width, mf->height);
1125 1125
1126 mf->colorspace = V4L2_COLORSPACE_JPEG; 1126 mf->colorspace = V4L2_COLORSPACE_JPEG;
@@ -1196,7 +1196,7 @@ static int fimc_lite_subdev_get_selection(struct v4l2_subdev *sd,
1196 } 1196 }
1197 mutex_unlock(&fimc->lock); 1197 mutex_unlock(&fimc->lock);
1198 1198
1199 v4l2_dbg(1, debug, sd, "%s: (%d,%d) %dx%d, f_w: %d, f_h: %d", 1199 v4l2_dbg(1, debug, sd, "%s: (%d,%d) %dx%d, f_w: %d, f_h: %d\n",
1200 __func__, f->rect.left, f->rect.top, f->rect.width, 1200 __func__, f->rect.left, f->rect.top, f->rect.width,
1201 f->rect.height, f->f_width, f->f_height); 1201 f->rect.height, f->f_width, f->f_height);
1202 1202
@@ -1230,7 +1230,7 @@ static int fimc_lite_subdev_set_selection(struct v4l2_subdev *sd,
1230 } 1230 }
1231 mutex_unlock(&fimc->lock); 1231 mutex_unlock(&fimc->lock);
1232 1232
1233 v4l2_dbg(1, debug, sd, "%s: (%d,%d) %dx%d, f_w: %d, f_h: %d", 1233 v4l2_dbg(1, debug, sd, "%s: (%d,%d) %dx%d, f_w: %d, f_h: %d\n",
1234 __func__, f->rect.left, f->rect.top, f->rect.width, 1234 __func__, f->rect.left, f->rect.top, f->rect.width,
1235 f->rect.height, f->f_width, f->f_height); 1235 f->rect.height, f->f_width, f->f_height);
1236 1236
diff --git a/drivers/media/platform/s5p-fimc/fimc-mdevice.c b/drivers/media/platform/s5p-fimc/fimc-mdevice.c
index 27d346195dbd..52e1aa3c8982 100644
--- a/drivers/media/platform/s5p-fimc/fimc-mdevice.c
+++ b/drivers/media/platform/s5p-fimc/fimc-mdevice.c
@@ -556,7 +556,7 @@ static int __fimc_md_create_fimc_sink_links(struct fimc_md *fmd,
556 if (ret) 556 if (ret)
557 break; 557 break;
558 558
559 v4l2_info(&fmd->v4l2_dev, "created link [%s] %c> [%s]", 559 v4l2_info(&fmd->v4l2_dev, "created link [%s] %c> [%s]\n",
560 source->name, flags ? '=' : '-', sink->name); 560 source->name, flags ? '=' : '-', sink->name);
561 } 561 }
562 return 0; 562 return 0;
@@ -640,7 +640,7 @@ static int fimc_md_create_links(struct fimc_md *fmd)
640 if (ret) 640 if (ret)
641 return ret; 641 return ret;
642 642
643 v4l2_info(&fmd->v4l2_dev, "created link [%s] => [%s]", 643 v4l2_info(&fmd->v4l2_dev, "created link [%s] => [%s]\n",
644 sensor->entity.name, csis->entity.name); 644 sensor->entity.name, csis->entity.name);
645 645
646 source = NULL; 646 source = NULL;