[media] exynos4-is: Don't overwrite subdevdata in the fimc-is sensor driver

It's an I2C client driver and it must not overwrite the struct v4l2_subdev
dev_priv field, which is used by the v4l2 core to store a pointer to
struct i2c_client.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/platform/exynos4-is/fimc-is-sensor.c b/drivers/media/platform/exynos4-is/fimc-is-sensor.c
index 035fa147de7f64eed96a267af2dbd6e7c418a614..6647421e5d3af6fca69e364c2e87af0abc2f2bf6 100644 (file)
--- a/drivers/media/platform/exynos4-is/fimc-is-sensor.c
+++ b/drivers/media/platform/exynos4-is/fimc-is-sensor.c
@@ -40,11 +40,6 @@ static const struct v4l2_mbus_framefmt fimc_is_sensor_formats[] = {
        }
 };
 
-static struct fimc_is_sensor *sd_to_fimc_is_sensor(struct v4l2_subdev *sd)
-{
-       return container_of(sd, struct fimc_is_sensor, subdev);
-}
-
 static const struct v4l2_mbus_framefmt *find_sensor_format(
        struct v4l2_mbus_framefmt *mf)
 {
@@ -147,7 +142,7 @@ static const struct v4l2_subdev_internal_ops fimc_is_sensor_sd_internal_ops = {
 
 static int fimc_is_sensor_s_power(struct v4l2_subdev *sd, int on)
 {
-       struct fimc_is_sensor *sensor = v4l2_get_subdevdata(sd);
+       struct fimc_is_sensor *sensor = sd_to_fimc_is_sensor(sd);
        int gpio = sensor->gpio_reset;
        int ret;
 
@@ -252,7 +247,6 @@ static int fimc_is_sensor_probe(struct i2c_client *client,
        if (ret < 0)
                return ret;
 
-       v4l2_set_subdevdata(sd, sensor);
        pm_runtime_no_callbacks(dev);
        pm_runtime_enable(dev);
 

diff --git a/drivers/media/platform/exynos4-is/fimc-is-sensor.h b/drivers/media/platform/exynos4-is/fimc-is-sensor.h
index 50b8e4d59d62cbaf34724e4f97b64c0b71324d0b..6036d49a6c689e5bf10e2ec92fcdf5cab8efda2b 100644 (file)
--- a/drivers/media/platform/exynos4-is/fimc-is-sensor.h
+++ b/drivers/media/platform/exynos4-is/fimc-is-sensor.h
@@ -77,6 +77,12 @@ struct fimc_is_sensor {
        struct v4l2_mbus_framefmt format;
 };
 
+static inline
+struct fimc_is_sensor *sd_to_fimc_is_sensor(struct v4l2_subdev *sd)
+{
+       return container_of(sd, struct fimc_is_sensor, subdev);
+}
+
 int fimc_is_register_sensor_driver(void);
 void fimc_is_unregister_sensor_driver(void);
 

diff --git a/drivers/media/platform/exynos4-is/fimc-is.c b/drivers/media/platform/exynos4-is/fimc-is.c
index 3c81c882bfd10bc2a96b92b3fbafd209c52ce743..c4049d44e68794017d3551edc3ec3889d5e45960 100644 (file)
--- a/drivers/media/platform/exynos4-is/fimc-is.c
+++ b/drivers/media/platform/exynos4-is/fimc-is.c
@@ -220,7 +220,7 @@ static int fimc_is_register_subdevs(struct fimc_is *is)
                        if (WARN_ON(is->sensor))
                                continue;
 
-                       is->sensor = v4l2_get_subdevdata(sd);
+                       is->sensor = sd_to_fimc_is_sensor(sd);
 
                        if (fimc_is_parse_sensor_config(is->sensor, child)) {
                                dev_warn(&is->pdev->dev, "DT parse error: %s\n",