Merge remote-tracking branch 'omap_dss2/for-next'

[deliverable/linux.git] / drivers / media / platform / s5p-jpeg / jpeg-core.c

diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c
index 785e6936c881dbda58e4b2d697c9489758df9233..dde9d3598c48a26a6a38e4ad0180cbc39d7a43a6 100644 (file)
--- a/drivers/media/platform/s5p-jpeg/jpeg-core.c
+++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c
@@ -537,6 +537,7 @@ static const u32 fourcc_to_dwngrd_schema_id[] = {
 static int s5p_jpeg_get_dwngrd_sch_id_by_fourcc(u32 fourcc)
 {
        int i;
+
        for (i = 0; i < ARRAY_SIZE(fourcc_to_dwngrd_schema_id); ++i) {
                if (fourcc_to_dwngrd_schema_id[i] == fourcc)
                        return i;
@@ -1246,17 +1247,18 @@ static int s5p_jpeg_querycap(struct file *file, void *priv,
        struct s5p_jpeg_ctx *ctx = fh_to_ctx(priv);
 
        if (ctx->mode == S5P_JPEG_ENCODE) {
-               strlcpy(cap->driver, S5P_JPEG_M2M_NAME " encoder",
+               strlcpy(cap->driver, S5P_JPEG_M2M_NAME,
                        sizeof(cap->driver));
                strlcpy(cap->card, S5P_JPEG_M2M_NAME " encoder",
                        sizeof(cap->card));
        } else {
-               strlcpy(cap->driver, S5P_JPEG_M2M_NAME " decoder",
+               strlcpy(cap->driver, S5P_JPEG_M2M_NAME,
                        sizeof(cap->driver));
                strlcpy(cap->card, S5P_JPEG_M2M_NAME " decoder",
                        sizeof(cap->card));
        }
-       cap->bus_info[0] = 0;
+       snprintf(cap->bus_info, sizeof(cap->bus_info), "platform:%s",
+                dev_name(ctx->jpeg->dev));
        cap->device_caps = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_M2M;
        cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
        return 0;
@@ -1273,7 +1275,8 @@ static int enum_fmt(struct s5p_jpeg_fmt *sjpeg_formats, int n,
                        if (num == f->index)
                                break;
                        /* Correct type but haven't reached our index yet,
-                        * just increment per-type index */
+                        * just increment per-type index
+                        */
                        ++num;
                }
        }
@@ -1349,6 +1352,7 @@ static int s5p_jpeg_g_fmt(struct file *file, void *priv, struct v4l2_format *f)
        pix->bytesperline = 0;
        if (q_data->fmt->fourcc != V4L2_PIX_FMT_JPEG) {
                u32 bpl = q_data->w;
+
                if (q_data->fmt->colplanes == 1)
                        bpl = (bpl * q_data->fmt->depth) >> 3;
                pix->bytesperline = bpl;
@@ -1374,6 +1378,7 @@ static struct s5p_jpeg_fmt *s5p_jpeg_find_format(struct s5p_jpeg_ctx *ctx,
 
        for (k = 0; k < ARRAY_SIZE(sjpeg_formats); k++) {
                struct s5p_jpeg_fmt *fmt = &sjpeg_formats[k];
+
                if (fmt->fourcc == pixelformat &&
                    fmt->flags & fmt_flag &&
                    fmt->flags & ctx->jpeg->variant->fmt_ver_flag) {
@@ -1431,7 +1436,8 @@ static int vidioc_try_fmt(struct v4l2_format *f, struct s5p_jpeg_fmt *fmt,
                return -EINVAL;
 
        /* V4L2 specification suggests the driver corrects the format struct
-        * if any of the dimensions is unsupported */
+        * if any of the dimensions is unsupported
+        */
        if (q_type == FMT_TYPE_OUTPUT)
                jpeg_bound_align_image(ctx, &pix->width, S5P_JPEG_MIN_WIDTH,
                                       S5P_JPEG_MAX_WIDTH, 0,
@@ -2489,6 +2495,7 @@ static void s5p_jpeg_buf_queue(struct vb2_buffer *vb)
        if (ctx->mode == S5P_JPEG_DECODE &&
            vb->vb2_queue->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) {
                struct s5p_jpeg_q_data tmp, *q_data;
+
                ctx->hdr_parsed = s5p_jpeg_parse_hdr(&tmp,
                     (unsigned long)vb2_plane_vaddr(vb, 0),
                     min((unsigned long)ctx->out_q.size,
@@ -3016,7 +3023,8 @@ static int s5p_jpeg_resume(struct device *dev)
 
 static const struct dev_pm_ops s5p_jpeg_pm_ops = {
        SET_SYSTEM_SLEEP_PM_OPS(s5p_jpeg_suspend, s5p_jpeg_resume)
-       SET_RUNTIME_PM_OPS(s5p_jpeg_runtime_suspend, s5p_jpeg_runtime_resume, NULL)
+       SET_RUNTIME_PM_OPS(s5p_jpeg_runtime_suspend, s5p_jpeg_runtime_resume,
+                          NULL)
 };
 
 static struct s5p_jpeg_variant s5p_jpeg_drvdata = {