p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Simplify the code by adding m2m_ops field to the
s5p_jpeg_variant structure which allows to avoid
"if" statement in the s5p_jpeg_probe 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>
This commit is contained in:
Jacek Anaszewski 2014-04-10 04:32:13 -03:00 committed by Mauro Carvalho Chehab
parent 35cd02a3ec
commit bf689bb819
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/media/platform/s5p-jpeg/jpeg-core.c
View File

@ -1566,7 +1566,7 @@ static struct v4l2_m2m_ops s5p_jpeg_m2m_ops = {
.job_abort = s5p_jpeg_job_abort, .job_abort = s5p_jpeg_job_abort,
} }
; ;
static struct v4l2_m2m_ops exynos_jpeg_m2m_ops = { static struct v4l2_m2m_ops exynos4_jpeg_m2m_ops = {
.device_run = exynos4_jpeg_device_run, .device_run = exynos4_jpeg_device_run,
.job_ready = s5p_jpeg_job_ready, .job_ready = s5p_jpeg_job_ready,
.job_abort = s5p_jpeg_job_abort, .job_abort = s5p_jpeg_job_abort,
@ -1850,7 +1850,6 @@ static int s5p_jpeg_probe(struct platform_device *pdev)
{ {
struct s5p_jpeg *jpeg; struct s5p_jpeg *jpeg;
struct resource *res; struct resource *res;
struct v4l2_m2m_ops *samsung_jpeg_m2m_ops;
int ret; int ret;
if (!pdev->dev.of_node) if (!pdev->dev.of_node)
@ -1904,13 +1903,8 @@ static int s5p_jpeg_probe(struct platform_device *pdev)
goto clk_get_rollback; goto clk_get_rollback;
} }
if (jpeg->variant->version == SJPEG_S5P)
samsung_jpeg_m2m_ops = &s5p_jpeg_m2m_ops;
else
samsung_jpeg_m2m_ops = &exynos_jpeg_m2m_ops;
/* mem2mem device */ /* mem2mem device */
jpeg->m2m_dev = v4l2_m2m_init(samsung_jpeg_m2m_ops); jpeg->m2m_dev = v4l2_m2m_init(jpeg->variant->m2m_ops);
if (IS_ERR(jpeg->m2m_dev)) { if (IS_ERR(jpeg->m2m_dev)) {
v4l2_err(&jpeg->v4l2_dev, "Failed to init mem2mem device\n"); v4l2_err(&jpeg->v4l2_dev, "Failed to init mem2mem device\n");
ret = PTR_ERR(jpeg->m2m_dev); ret = PTR_ERR(jpeg->m2m_dev);
@ -2099,12 +2093,14 @@ static const struct dev_pm_ops s5p_jpeg_pm_ops = {
static struct s5p_jpeg_variant s5p_jpeg_drvdata = { static struct s5p_jpeg_variant s5p_jpeg_drvdata = {
.version = SJPEG_S5P, .version = SJPEG_S5P,
.jpeg_irq = s5p_jpeg_irq, .jpeg_irq = s5p_jpeg_irq,
.m2m_ops = &s5p_jpeg_m2m_ops,
.fmt_ver_flag = SJPEG_FMT_FLAG_S5P, .fmt_ver_flag = SJPEG_FMT_FLAG_S5P,
}; };
static struct s5p_jpeg_variant exynos4_jpeg_drvdata = { static struct s5p_jpeg_variant exynos4_jpeg_drvdata = {
.version = SJPEG_EXYNOS4, .version = SJPEG_EXYNOS4,
.jpeg_irq = exynos4_jpeg_irq, .jpeg_irq = exynos4_jpeg_irq,
.m2m_ops = &exynos4_jpeg_m2m_ops,
.fmt_ver_flag = SJPEG_FMT_FLAG_EXYNOS4, .fmt_ver_flag = SJPEG_FMT_FLAG_EXYNOS4,
}; };

7
drivers/media/platform/s5p-jpeg/jpeg-core.h
View File

@ -117,9 +117,10 @@ struct s5p_jpeg {
}; };
struct s5p_jpeg_variant { struct s5p_jpeg_variant {
unsigned int version; unsigned int version;
unsigned int fmt_ver_flag; unsigned int fmt_ver_flag;
irqreturn_t (*jpeg_irq)(int irq, void *priv); struct v4l2_m2m_ops *m2m_ops;
irqreturn_t (*jpeg_irq)(int irq, void *priv);
}; };
/** /**