1 files changed, 13 insertions, 13 deletions

diff --git a/drivers/media/video/mt9m001.c b/drivers/media/video/mt9m001.c
index 79f096ddcf5d..fcb4cd941853 100644
--- a/drivers/media/video/mt9m001.c
+++ b/drivers/media/video/mt9m001.c
@@ -157,7 +157,7 @@ static int mt9m001_init(struct i2c_client *client)
 
 static int mt9m001_s_stream(struct v4l2_subdev *sd, int enable)
 {
-        struct i2c_client *client = sd->priv;
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
 
         /* Switch to master "normal" mode or stop sensor readout */
         if (reg_write(client, MT9M001_OUTPUT_CONTROL, enable ? 2 : 0) < 0)
@@ -206,7 +206,7 @@ static unsigned long mt9m001_query_bus_param(struct soc_camera_device *icd)
 
 static int mt9m001_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
 {
-        struct i2c_client *client = sd->priv;
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
         struct mt9m001 *mt9m001 = to_mt9m001(client);
         struct v4l2_rect rect = a->c;
         struct soc_camera_device *icd = client->dev.platform_data;
@@ -271,7 +271,7 @@ static int mt9m001_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
 
 static int mt9m001_g_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
 {
-        struct i2c_client *client = sd->priv;
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
         struct mt9m001 *mt9m001 = to_mt9m001(client);
 
         a->c    = mt9m001->rect;
@@ -297,7 +297,7 @@ static int mt9m001_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)
 static int mt9m001_g_fmt(struct v4l2_subdev *sd,
                          struct v4l2_mbus_framefmt *mf)
 {
-        struct i2c_client *client = sd->priv;
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
         struct mt9m001 *mt9m001 = to_mt9m001(client);
 
         mf->width       = mt9m001->rect.width;
@@ -312,7 +312,7 @@ static int mt9m001_g_fmt(struct v4l2_subdev *sd,
 static int mt9m001_s_fmt(struct v4l2_subdev *sd,
                          struct v4l2_mbus_framefmt *mf)
 {
-        struct i2c_client *client = sd->priv;
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
         struct mt9m001 *mt9m001 = to_mt9m001(client);
         struct v4l2_crop a = {
                 .c = {
@@ -340,7 +340,7 @@ static int mt9m001_s_fmt(struct v4l2_subdev *sd,
 static int mt9m001_try_fmt(struct v4l2_subdev *sd,
                            struct v4l2_mbus_framefmt *mf)
 {
-        struct i2c_client *client = sd->priv;
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
         struct mt9m001 *mt9m001 = to_mt9m001(client);
         const struct mt9m001_datafmt *fmt;
 
@@ -367,7 +367,7 @@ static int mt9m001_try_fmt(struct v4l2_subdev *sd,
 static int mt9m001_g_chip_ident(struct v4l2_subdev *sd,
                                 struct v4l2_dbg_chip_ident *id)
 {
-        struct i2c_client *client = sd->priv;
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
         struct mt9m001 *mt9m001 = to_mt9m001(client);
 
         if (id->match.type != V4L2_CHIP_MATCH_I2C_ADDR)
@@ -386,7 +386,7 @@ static int mt9m001_g_chip_ident(struct v4l2_subdev *sd,
 static int mt9m001_g_register(struct v4l2_subdev *sd,
                               struct v4l2_dbg_register *reg)
 {
-        struct i2c_client *client = sd->priv;
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
 
         if (reg->match.type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0xff)
                 return -EINVAL;
@@ -406,7 +406,7 @@ static int mt9m001_g_register(struct v4l2_subdev *sd,
 static int mt9m001_s_register(struct v4l2_subdev *sd,
                               struct v4l2_dbg_register *reg)
 {
-        struct i2c_client *client = sd->priv;
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
 
         if (reg->match.type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0xff)
                 return -EINVAL;
@@ -468,7 +468,7 @@ static struct soc_camera_ops mt9m001_ops = {
 
 static int mt9m001_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
 {
-        struct i2c_client *client = sd->priv;
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
         struct mt9m001 *mt9m001 = to_mt9m001(client);
         int data;
 
@@ -494,7 +494,7 @@ static int mt9m001_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
 
 static int mt9m001_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
 {
-        struct i2c_client *client = sd->priv;
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
         struct mt9m001 *mt9m001 = to_mt9m001(client);
         struct soc_camera_device *icd = client->dev.platform_data;
         const struct v4l2_queryctrl *qctrl;
@@ -683,7 +683,7 @@ static void mt9m001_video_remove(struct soc_camera_device *icd)
 
 static int mt9m001_g_skip_top_lines(struct v4l2_subdev *sd, u32 *lines)
 {
-        struct i2c_client *client = sd->priv;
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
         struct mt9m001 *mt9m001 = to_mt9m001(client);
 
         *lines = mt9m001->y_skip_top;
@@ -704,7 +704,7 @@ static struct v4l2_subdev_core_ops mt9m001_subdev_core_ops = {
 static int mt9m001_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
                             enum v4l2_mbus_pixelcode *code)
 {
-        struct i2c_client *client = sd->priv;
+        struct i2c_client *client = v4l2_get_subdevdata(sd);
         struct mt9m001 *mt9m001 = to_mt9m001(client);
 
         if (index >= mt9m001->num_fmts)