media: i2c: Fix references to pad config

V4L2 subdev operations have moved from operating on a
v4l2_subdev_pad_config to a v4l2_subdev_state a long time ago. Fix the
few remaining incorrect references to pad config in the I2C drivers.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/i2c/imx334.c b/drivers/media/i2c/imx334.c
index 1196fe93506bd08593eabb70dfbdbb49514d7a32..404d0f1dffcd2c388e05e10586fb0119a393fe92 100644 (file)
--- a/drivers/media/i2c/imx334.c
+++ b/drivers/media/i2c/imx334.c
@@ -935,14 +935,14 @@ static int imx334_set_pad_format(struct v4l2_subdev *sd,
 }
 
 /**
- * imx334_init_pad_cfg() - Initialize sub-device pad configuration
+ * imx334_init_cfg() - Initialize sub-device state
  * @sd: pointer to imx334 V4L2 sub-device structure
  * @sd_state: V4L2 sub-device state
  *
  * Return: 0 if successful, error code otherwise.
  */
-static int imx334_init_pad_cfg(struct v4l2_subdev *sd,
-                              struct v4l2_subdev_state *sd_state)
+static int imx334_init_cfg(struct v4l2_subdev *sd,
+                          struct v4l2_subdev_state *sd_state)
 {
        struct imx334 *imx334 = to_imx334(sd);
        struct v4l2_subdev_format fmt = { 0 };
@@ -1190,7 +1190,7 @@ static const struct v4l2_subdev_video_ops imx334_video_ops = {
 };
 
 static const struct v4l2_subdev_pad_ops imx334_pad_ops = {
-       .init_cfg = imx334_init_pad_cfg,
+       .init_cfg = imx334_init_cfg,
        .enum_mbus_code = imx334_enum_mbus_code,
        .enum_frame_size = imx334_enum_frame_size,
        .get_fmt = imx334_get_pad_format,

diff --git a/drivers/media/i2c/imx335.c b/drivers/media/i2c/imx335.c
index ec729126274b2badd40cb3f8b2f5a552ae8c92e5..01c871c1ab616ee49af87ca244739503831e49c1 100644 (file)
--- a/drivers/media/i2c/imx335.c
+++ b/drivers/media/i2c/imx335.c
@@ -618,14 +618,14 @@ static int imx335_set_pad_format(struct v4l2_subdev *sd,
 }
 
 /**
- * imx335_init_pad_cfg() - Initialize sub-device pad configuration
+ * imx335_init_cfg() - Initialize sub-device state
  * @sd: pointer to imx335 V4L2 sub-device structure
  * @sd_state: V4L2 sub-device configuration
  *
  * Return: 0 if successful, error code otherwise.
  */
-static int imx335_init_pad_cfg(struct v4l2_subdev *sd,
-                              struct v4l2_subdev_state *sd_state)
+static int imx335_init_cfg(struct v4l2_subdev *sd,
+                          struct v4l2_subdev_state *sd_state)
 {
        struct imx335 *imx335 = to_imx335(sd);
        struct v4l2_subdev_format fmt = { 0 };
@@ -835,7 +835,7 @@ static const struct v4l2_subdev_video_ops imx335_video_ops = {
 };
 
 static const struct v4l2_subdev_pad_ops imx335_pad_ops = {
-       .init_cfg = imx335_init_pad_cfg,
+       .init_cfg = imx335_init_cfg,
        .enum_mbus_code = imx335_enum_mbus_code,
        .enum_frame_size = imx335_enum_frame_size,
        .get_fmt = imx335_get_pad_format,

diff --git a/drivers/media/i2c/imx412.c b/drivers/media/i2c/imx412.c
index 962b3136c31ee2a50b84de2fa8fdc67aa9ee5b32..dd5cf7f20310ba01c5f372704ed61aff105b9e14 100644 (file)
--- a/drivers/media/i2c/imx412.c
+++ b/drivers/media/i2c/imx412.c
@@ -770,14 +770,14 @@ static int imx412_set_pad_format(struct v4l2_subdev *sd,
 }
 
 /**
- * imx412_init_pad_cfg() - Initialize sub-device pad configuration
+ * imx412_init_cfg() - Initialize sub-device state
  * @sd: pointer to imx412 V4L2 sub-device structure
  * @sd_state: V4L2 sub-device configuration
  *
  * Return: 0 if successful, error code otherwise.
  */
-static int imx412_init_pad_cfg(struct v4l2_subdev *sd,
-                              struct v4l2_subdev_state *sd_state)
+static int imx412_init_cfg(struct v4l2_subdev *sd,
+                          struct v4l2_subdev_state *sd_state)
 {
        struct imx412 *imx412 = to_imx412(sd);
        struct v4l2_subdev_format fmt = { 0 };
@@ -997,7 +997,7 @@ static const struct v4l2_subdev_video_ops imx412_video_ops = {
 };
 
 static const struct v4l2_subdev_pad_ops imx412_pad_ops = {
-       .init_cfg = imx412_init_pad_cfg,
+       .init_cfg = imx412_init_cfg,
        .enum_mbus_code = imx412_enum_mbus_code,
        .enum_frame_size = imx412_enum_frame_size,
        .get_fmt = imx412_get_pad_format,

diff --git a/drivers/media/i2c/ov9282.c b/drivers/media/i2c/ov9282.c
index bf6dfce1b5dd8867ef120e452b3d59c916f22bad..b50a6196b89cd942bcd531b026272814aae17b54 100644 (file)
--- a/drivers/media/i2c/ov9282.c
+++ b/drivers/media/i2c/ov9282.c
@@ -876,14 +876,14 @@ static int ov9282_set_pad_format(struct v4l2_subdev *sd,
 }
 
 /**
- * ov9282_init_pad_cfg() - Initialize sub-device pad configuration
+ * ov9282_init_cfg() - Initialize sub-device state
  * @sd: pointer to ov9282 V4L2 sub-device structure
  * @sd_state: V4L2 sub-device configuration
  *
  * Return: 0 if successful, error code otherwise.
  */
-static int ov9282_init_pad_cfg(struct v4l2_subdev *sd,
-                              struct v4l2_subdev_state *sd_state)
+static int ov9282_init_cfg(struct v4l2_subdev *sd,
+                          struct v4l2_subdev_state *sd_state)
 {
        struct ov9282 *ov9282 = to_ov9282(sd);
        struct v4l2_subdev_format fmt = { 0 };
@@ -1192,7 +1192,7 @@ static const struct v4l2_subdev_video_ops ov9282_video_ops = {
 };
 
 static const struct v4l2_subdev_pad_ops ov9282_pad_ops = {
-       .init_cfg = ov9282_init_pad_cfg,
+       .init_cfg = ov9282_init_cfg,
        .enum_mbus_code = ov9282_enum_mbus_code,
        .enum_frame_size = ov9282_enum_frame_size,
        .get_fmt = ov9282_get_pad_format,

diff --git a/drivers/media/i2c/tvp7002.c b/drivers/media/i2c/tvp7002.c
index a2d7bc79984930b9bb9397980baf79482d05d08c..30831b4b56d6b18b8c344d2d1ff6005f40947679 100644 (file)
--- a/drivers/media/i2c/tvp7002.c
+++ b/drivers/media/i2c/tvp7002.c
@@ -791,7 +791,7 @@ static const struct v4l2_ctrl_ops tvp7002_ctrl_ops = {
 /*
  * tvp7002_enum_mbus_code() - Enum supported digital video format on pad
  * @sd: pointer to standard V4L2 sub-device structure
- * @cfg: pad configuration
+ * @sd_state: V4L2 subdev state
  * @code: pointer to subdev enum mbus code struct
  *
  * Enumerate supported digital video formats for pad.
@@ -813,7 +813,7 @@ tvp7002_enum_mbus_code(struct v4l2_subdev *sd,
 /*
  * tvp7002_get_pad_format() - get video format on pad
  * @sd: pointer to standard V4L2 sub-device structure
- * @cfg: pad configuration
+ * @sd_state: V4L2 subdev state
  * @fmt: pointer to subdev format struct
  *
  * get video format for pad.
@@ -837,7 +837,7 @@ tvp7002_get_pad_format(struct v4l2_subdev *sd,
 /*
  * tvp7002_set_pad_format() - set video format on pad
  * @sd: pointer to standard V4L2 sub-device structure
- * @cfg: pad configuration
+ * @sd_state: V4L2 subdev state
  * @fmt: pointer to subdev format struct
  *
  * set video format for pad.