fimc-is: Get rid of struct v4l2_subdev_core_ops::init use

The init() is too limited to be used in this driver, it is deprecated
and usage of this callback should be removed anyway.
There is no device nodes for subdevs so ioctl is no exposed to user space.

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

diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-device-csi.c b/drivers/media/platform/exynos/fimc-is/fimc-is-device-csi.c
index 2e210825cf44ab954a6031a6bb2e8413d5beeb66..cf712ebbae40646e02ad8f13049cdc22df04b996 100644 (file)
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-device-csi.c
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-device-csi.c
@@ -103,7 +103,7 @@ int fimc_is_csi_close(struct v4l2_subdev *subdev)
 }
 
 /* value : module enum */
-static int csi_init(struct v4l2_subdev *subdev, void *value)
+static long csi_init(struct v4l2_subdev *subdev, unsigned int cmd, void *value)
 {
        int ret = 0;
        struct fimc_is_device_csi *csi;
@@ -167,7 +167,7 @@ p_err:
 }
 
 static const struct v4l2_subdev_core_ops core_ops = {
-       .init = csi_init,
+       .ioctl = csi_init,
        .s_power = csi_s_power
 };
 

diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-device-flite.c b/drivers/media/platform/exynos/fimc-is/fimc-is-device-flite.c
index 46aa3d8d0ccf328bfe144945a1e95d705d4ab745..7346262ae7cb3d1a0bd34f0838d8d81600b57eeb 100644 (file)
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-device-flite.c
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-device-flite.c
@@ -1495,7 +1495,8 @@ p_err:
 }
 
 /* value : csi ch */
-static int flite_init(struct v4l2_subdev *subdev, void *value)
+static long flite_init(struct v4l2_subdev *subdev, unsigned int cmd,
+                      void *value)
 {
        int ret = 0;
        struct fimc_is_device_flite *flite;
@@ -1842,7 +1843,7 @@ p_err:
 }
 
 static const struct v4l2_subdev_core_ops core_ops = {
-       .init = flite_init,
+       .ioctl = flite_init,
        .s_ctrl = flite_s_ctrl,
 };
 

diff --git a/drivers/media/platform/exynos/fimc-is/fimc-is-device-sensor.c b/drivers/media/platform/exynos/fimc-is/fimc-is-device-sensor.c
index 33c777004c67a16d5d2470a47f3004493d223b69..0e226f4510e4d314c5f5551139d9e58e16e3e441 100644 (file)
--- a/drivers/media/platform/exynos/fimc-is/fimc-is-device-sensor.c
+++ b/drivers/media/platform/exynos/fimc-is/fimc-is-device-sensor.c
@@ -1139,20 +1139,21 @@ int fimc_is_sensor_s_input(struct fimc_is_device_sensor *device,
                goto p_err;
        }
 
-       ret = v4l2_subdev_call(subdev_flite, core, init, (void *)(long)device->pdata->csi_ch);
+       ret = v4l2_subdev_call(subdev_flite, core, ioctl, 0,
+                              (void *)(long)device->pdata->csi_ch);
        if (ret) {
                merr("v4l2_flite_call(init) is fail(%d)", device, ret);
                goto p_err;
        }
 
-       ret = v4l2_subdev_call(subdev_csi, core, init, module);
+       ret = v4l2_subdev_call(subdev_csi, core, ioctl, 0, module);
        if (ret) {
                merr("v4l2_csi_call(init) is fail(%d)", device, ret);
                goto p_err;
        }
 
        if (test_bit(FIMC_IS_SENSOR_DRIVING, &device->state)) {
-               ret = v4l2_subdev_call(subdev_module, core, init, 0);
+               ret = v4l2_subdev_call(subdev_module, core, ioctl, 0, 0);
                if (ret) {
                        merr("v4l2_module_call(init) is fail(%d)", device, ret);
                        goto p_err;

diff --git a/drivers/media/platform/exynos/fimc-is/sensor/fimc-is-device-6d1.c b/drivers/media/platform/exynos/fimc-is/sensor/fimc-is-device-6d1.c
index c6d2af2d90321b28ec5b6b322093cc8b1e0fed29..2de119caff41bd1613cc32eaa1c40a4bb8458bef 100644 (file)
--- a/drivers/media/platform/exynos/fimc-is/sensor/fimc-is-device-6d1.c
+++ b/drivers/media/platform/exynos/fimc-is/sensor/fimc-is-device-6d1.c
@@ -238,7 +238,8 @@ static const struct v4l2_subdev_internal_ops internal_ops = {
        .unregistered = sensor_6d1_unregistered,
 };
 
-static int sensor_6d1_init(struct v4l2_subdev *subdev, void *val)
+static long sensor_6d1_init(struct v4l2_subdev *subdev, unsigned int cmd,
+                           void *val)
 {
        int i, ret = 0;
        struct fimc_is_module_enum *module;
@@ -268,7 +269,7 @@ static int sensor_6d1_init(struct v4l2_subdev *subdev, void *val)
 }
 
 static const struct v4l2_subdev_core_ops core_ops = {
-       .init = sensor_6d1_init
+       .ioctl = sensor_6d1_init
 };
 
 static int sensor_6d1_s_stream(struct v4l2_subdev *subdev, int enable)

diff --git a/drivers/media/platform/exynos/fimc-is/sensor/fimc-is-device-imx240.c b/drivers/media/platform/exynos/fimc-is/sensor/fimc-is-device-imx240.c
index 406711965871ea11e179b29c7af05cfc52dcfa3f..9472e0e05613ab0bdc36e3d20c0ff848f2c3b26a 100644 (file)
--- a/drivers/media/platform/exynos/fimc-is/sensor/fimc-is-device-imx240.c
+++ b/drivers/media/platform/exynos/fimc-is/sensor/fimc-is-device-imx240.c
@@ -59,7 +59,8 @@ static struct fimc_is_sensor_cfg config_imx240[] = {
        //FIMC_IS_SENSOR_CFG(824, 496, 300, 13, 8),
 };
 
-static int sensor_imx240_init(struct v4l2_subdev *subdev, void *val)
+static long sensor_imx240_init(struct v4l2_subdev *subdev, unsigned int cmd,
+                             void *val)
 {
        int ret = 0;
        struct fimc_is_module_enum *module;
@@ -74,7 +75,7 @@ static int sensor_imx240_init(struct v4l2_subdev *subdev, void *val)
 }
 
 static const struct v4l2_subdev_core_ops core_ops = {
-       .init = sensor_imx240_init
+       .ioctl = sensor_imx240_init
 };
 
 static const struct v4l2_subdev_ops subdev_ops = {