[media] s5p-jpeg: Add fmt_ver_flag field to the s5p_jpeg_variant structure

Simplify the code by adding fmt_ver_flag field
to the s5p_jpeg_variant structure which allows
to avoid "if" statement in the s5p_jpeg_find_format
function.

Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c
index 368b3f6df24bbc31e8f0e7761e83a5e9adc31f30..8202fed79345b199e415f5420d2e54d90d511b62 100644 (file)
--- a/drivers/media/platform/s5p-jpeg/jpeg-core.c
+++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c
@@ -959,7 +959,7 @@ static int s5p_jpeg_g_fmt(struct file *file, void *priv, struct v4l2_format *f)
 static struct s5p_jpeg_fmt *s5p_jpeg_find_format(struct s5p_jpeg_ctx *ctx,
                                u32 pixelformat, unsigned int fmt_type)
 {
-       unsigned int k, fmt_flag, ver_flag;
+       unsigned int k, fmt_flag;
 
        if (ctx->mode == S5P_JPEG_ENCODE)
                fmt_flag = (fmt_type == FMT_TYPE_OUTPUT) ?
@@ -970,16 +970,11 @@ static struct s5p_jpeg_fmt *s5p_jpeg_find_format(struct s5p_jpeg_ctx *ctx,
                                SJPEG_FMT_FLAG_DEC_OUTPUT :
                                SJPEG_FMT_FLAG_DEC_CAPTURE;
 
-       if (ctx->jpeg->variant->version == SJPEG_S5P)
-               ver_flag = SJPEG_FMT_FLAG_S5P;
-       else
-               ver_flag = SJPEG_FMT_FLAG_EXYNOS4;
-
        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 & ver_flag) {
+                   fmt->flags & ctx->jpeg->variant->fmt_ver_flag) {
                        return fmt;
                }
        }
@@ -2104,11 +2099,13 @@ static const struct dev_pm_ops s5p_jpeg_pm_ops = {
 static struct s5p_jpeg_variant s5p_jpeg_drvdata = {
        .version        = SJPEG_S5P,
        .jpeg_irq       = s5p_jpeg_irq,
+       .fmt_ver_flag   = SJPEG_FMT_FLAG_S5P,
 };
 
 static struct s5p_jpeg_variant exynos4_jpeg_drvdata = {
        .version        = SJPEG_EXYNOS4,
        .jpeg_irq       = exynos4_jpeg_irq,
+       .fmt_ver_flag   = SJPEG_FMT_FLAG_EXYNOS4,
 };
 
 static const struct of_device_id samsung_jpeg_match[] = {

diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.h b/drivers/media/platform/s5p-jpeg/jpeg-core.h
index f482dbf55d5f5a0124c1618bc9b0c8e3831762fe..c222436d4661a4a4805886c971131198e2ef94e7 100644 (file)
--- a/drivers/media/platform/s5p-jpeg/jpeg-core.h
+++ b/drivers/media/platform/s5p-jpeg/jpeg-core.h
@@ -118,6 +118,7 @@ struct s5p_jpeg {
 
 struct s5p_jpeg_variant {
        unsigned int    version;
+       unsigned int    fmt_ver_flag;
        irqreturn_t     (*jpeg_irq)(int irq, void *priv);
 };