media: soc_camera_platform: add dev_priv field

.priv field is used by Tegra V4L2 SoC camera driver, so introduce
a new field named .dev_priv.

Bug 1377330

Change-Id: Id714dca05d7640175b3dc25f7ce582d76abbcaf4
Signed-off-by: Bryan Wu <pengw@nvidia.com>
Reviewed-on: http://git-master/r/289328
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Allen Martin <amartin@nvidia.com>

diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h
index ff77d08c30fda6062bdcc45ccdf8327e1560b506..4584a0814e69421f94f9c3b2cd3c2cca4de34f58 100644 (file)
--- a/include/media/soc_camera.h
+++ b/include/media/soc_camera.h
@@ -122,6 +122,7 @@ struct soc_camera_subdev_desc {
 
        /* sensor driver private platform data */
        void *drv_priv;
+       void *dev_priv;
 
        /* Optional regulators that have to be managed on power on/off events */
        struct regulator_bulk_data *regulators;
@@ -177,6 +178,7 @@ struct soc_camera_link {
        unsigned long flags;
 
        void *priv;
+       void *dev_priv;
 
        /* Optional regulators that have to be managed on power on/off events */
        struct regulator_bulk_data *regulators;

diff --git a/include/media/soc_camera_platform.h b/include/media/soc_camera_platform.h
index 1e5065dab43096c36622afc6cfabd79c9ce6cec5..5472e52b31056e67ab002a05fc929dc44b5e14d4 100644 (file)
--- a/include/media/soc_camera_platform.h
+++ b/include/media/soc_camera_platform.h
@@ -40,7 +40,7 @@ static inline int soc_camera_platform_add(struct soc_camera_device *icd,
 {
        struct soc_camera_subdev_desc *ssdd =
                (struct soc_camera_subdev_desc *)plink;
-       struct soc_camera_platform_info *info = ssdd->drv_priv;
+       struct soc_camera_platform_info *info = ssdd->dev_priv;
        int ret;
 
        if (&icd->sdesc->subdev_desc != ssdd)