media: v4l: subdev: Clear frame descriptor before get_frame_desc

Clear frame descriptor before calling transmitter's get_frame_desc() op.
Also remove the corresponding memset() calls from drivers.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

diff --git a/drivers/media/i2c/ds90ub913.c b/drivers/media/i2c/ds90ub913.c
index 4bfa3b3cf619b36e0f3eb7bef9813fe8082cecb9..8e9ebed09f6498ef5c2db403191f5a01bc5646df 100644 (file)
--- a/drivers/media/i2c/ds90ub913.c
+++ b/drivers/media/i2c/ds90ub913.c
@@ -362,8 +362,6 @@ static int ub913_get_frame_desc(struct v4l2_subdev *sd, unsigned int pad,
        if (ret)
                return ret;
 
-       memset(fd, 0, sizeof(*fd));
-
        fd->type = V4L2_MBUS_FRAME_DESC_TYPE_PARALLEL;
 
        state = v4l2_subdev_lock_and_get_active_state(sd);

diff --git a/drivers/media/i2c/ds90ub953.c b/drivers/media/i2c/ds90ub953.c
index dc394e22a42c4383516e276e40ae4dcc877a7cd2..644022312833df8ac487a809a95eb7116aae5688 100644 (file)
--- a/drivers/media/i2c/ds90ub953.c
+++ b/drivers/media/i2c/ds90ub953.c
@@ -499,8 +499,6 @@ static int ub953_get_frame_desc(struct v4l2_subdev *sd, unsigned int pad,
        if (ret)
                return ret;
 
-       memset(fd, 0, sizeof(*fd));
-
        fd->type = V4L2_MBUS_FRAME_DESC_TYPE_CSI2;
 
        state = v4l2_subdev_lock_and_get_active_state(sd);

diff --git a/drivers/media/i2c/ds90ub960.c b/drivers/media/i2c/ds90ub960.c
index 8ba5750f5a2319c97d37cffd42b5ccf86880d252..b8f3e5ca03efba91274493a35db1312a7e32ca99 100644 (file)
--- a/drivers/media/i2c/ds90ub960.c
+++ b/drivers/media/i2c/ds90ub960.c
@@ -2786,8 +2786,6 @@ static int ub960_get_frame_desc(struct v4l2_subdev *sd, unsigned int pad,
        if (!ub960_pad_is_source(priv, pad))
                return -EINVAL;
 
-       memset(fd, 0, sizeof(*fd));
-
        fd->type = V4L2_MBUS_FRAME_DESC_TYPE_CSI2;
 
        state = v4l2_subdev_lock_and_get_active_state(&priv->sd);

diff --git a/drivers/media/platform/nxp/imx-mipi-csis.c b/drivers/media/platform/nxp/imx-mipi-csis.c
index 5f93712bf485408cb3a7d174b4ddb44b65250ff4..6cb20b45e0a1373c643dfc69b69d48cb2f83287c 100644 (file)
--- a/drivers/media/platform/nxp/imx-mipi-csis.c
+++ b/drivers/media/platform/nxp/imx-mipi-csis.c
@@ -1114,8 +1114,6 @@ static int mipi_csis_get_frame_desc(struct v4l2_subdev *sd, unsigned int pad,
        fd->type = V4L2_MBUS_FRAME_DESC_TYPE_PARALLEL;
        fd->num_entries = 1;
 
-       memset(entry, 0, sizeof(*entry));
-
        entry->flags = 0;
        entry->pixelcode = csis_fmt->code;
        entry->bus.csi2.vc = 0;

diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c
index 32b7d9cd43e62151e116bd2843c383a030c285ab..9cb04ace86ae64b3dd4c299c6513995b323f24a7 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-subdev.c
+++ b/drivers/media/v4l2-core/v4l2-subdev.c
@@ -306,6 +306,14 @@ static int call_set_selection(struct v4l2_subdev *sd,
               sd->ops->pad->set_selection(sd, state, sel);
 }
 
+static int call_get_frame_desc(struct v4l2_subdev *sd, unsigned int pad,
+                              struct v4l2_mbus_frame_desc *fd)
+{
+       memset(fd, 0, sizeof(*fd));
+
+       return sd->ops->pad->get_frame_desc(sd, pad, fd);
+}
+
 static inline int check_edid(struct v4l2_subdev *sd,
                             struct v4l2_subdev_edid *edid)
 {
@@ -446,6 +454,7 @@ static const struct v4l2_subdev_pad_ops v4l2_subdev_call_pad_wrappers = {
        .set_edid               = call_set_edid,
        .dv_timings_cap         = call_dv_timings_cap,
        .enum_dv_timings        = call_enum_dv_timings,
+       .get_frame_desc         = call_get_frame_desc,
        .get_mbus_config        = call_get_mbus_config,
 };