fimc-is: Use common struct v4l2_device for the companion device

Change-Id: Ia72b932676281dd972312e89d663ab096b4dbf79
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>

diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-device-companion.c b/drivers/media/platform/exynos/fimc-is/fimc-is-device-companion.c
index 53eed7cf920487cb03e2a5bd07b72d1b9c844b9f..8be018e96fa5d55789da837fb76afd2cfa77dba1 100644 (file)
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-device-companion.c
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-device-companion.c
@@ -501,11 +501,7 @@ static int fimc_is_companion_probe(struct platform_device *pdev)
        clear_bit(FIMC_IS_COMPANION_ICLK_ON, &device->state);
        clear_bit(FIMC_IS_COMPANION_GPIO_ON, &device->state);
 
-       ret = v4l2_device_register(&pdev->dev, &device->v4l2_dev);
-       if (ret) {
-               err("v4l2_device_register failed(%d)", ret);
-               goto p_err;
-       }
+       device->v4l2_dev = &core->v4l2_dev;
 
        ret = fimc_is_mem_probe(&device->mem, core->pdev);
        if (ret) {

diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-device-companion.h b/drivers/media/platform/exynos/fimc-is/fimc-is-device-companion.h
index 37bfb95f7fa5f72fb2660594e210d7e51f32484a..60027363cc687983b78e91fe51150bf2e7f59a8d 100644 (file)
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-device-companion.h
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-device-companion.h
@@ -34,7 +34,7 @@ enum fimc_is_companion_status {
 };
 
 struct fimc_is_device_companion {
-       struct v4l2_device                              v4l2_dev;
+       struct v4l2_device                              *v4l2_dev;
        struct platform_device                          *pdev;
        void __iomem                                    *regs;
        struct fimc_is_mem                              mem;

diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-video-companion.c b/drivers/media/platform/exynos/fimc-is/fimc-is-video-companion.c
index fc70cc77ae100b5b13c3a2eecfb88dd57170bd88..3f2bb5d1414378291584f582621fa883922667e9 100644 (file)
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-video-companion.c
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-video-companion.c
@@ -62,7 +62,7 @@ int fimc_is_comp_video_probe(void *data)
                number,
                VFL_DIR_RX,
                &device->mem,
-               &device->v4l2_dev,
+               device->v4l2_dev,
                &video->lock,
                &fimc_is_comp_video_fops,
                &fimc_is_comp_video_ioctl_ops);