| Message ID | 20230918125138.90002-11-sakari.ailus@linux.intel.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Small fixes and cleanups (ov2740 and ccs) | expand |
Hi Sakari, Thank you for the patch. On Mon, Sep 18, 2023 at 03:51:36PM +0300, Sakari Ailus wrote: > 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> > --- > drivers/media/i2c/ds90ub913.c | 2 -- > drivers/media/i2c/ds90ub953.c | 2 -- > drivers/media/i2c/ds90ub960.c | 2 -- > drivers/media/platform/nxp/imx-mipi-csis.c | 2 -- > drivers/media/v4l2-core/v4l2-subdev.c | 9 +++++++++ > 5 files changed, 9 insertions(+), 8 deletions(-) > > diff --git a/drivers/media/i2c/ds90ub913.c b/drivers/media/i2c/ds90ub913.c > index 4bfa3b3cf619..8e9ebed09f64 100644 > --- 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 dc394e22a42c..644022312833 100644 > --- 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 8ba5750f5a23..b8f3e5ca03ef 100644 > --- 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 16f19a640130..aac9cffe503c 100644 > --- 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 b92348ad61f6..7b087be3ff4f 100644 > --- 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); > +} I like the operation wrappers. Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > + > static inline int check_edid(struct v4l2_subdev *sd, > struct v4l2_subdev_edid *edid) > { > @@ -431,6 +439,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, > }; >
On 18/09/2023 15:51, Sakari Ailus wrote: > 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> > --- > drivers/media/i2c/ds90ub913.c | 2 -- > drivers/media/i2c/ds90ub953.c | 2 -- > drivers/media/i2c/ds90ub960.c | 2 -- > drivers/media/platform/nxp/imx-mipi-csis.c | 2 -- > drivers/media/v4l2-core/v4l2-subdev.c | 9 +++++++++ > 5 files changed, 9 insertions(+), 8 deletions(-) Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> Tomi > diff --git a/drivers/media/i2c/ds90ub913.c b/drivers/media/i2c/ds90ub913.c > index 4bfa3b3cf619..8e9ebed09f64 100644 > --- 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 dc394e22a42c..644022312833 100644 > --- 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 8ba5750f5a23..b8f3e5ca03ef 100644 > --- 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 16f19a640130..aac9cffe503c 100644 > --- 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 b92348ad61f6..7b087be3ff4f 100644 > --- 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) > { > @@ -431,6 +439,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, > }; >
diff --git a/drivers/media/i2c/ds90ub913.c b/drivers/media/i2c/ds90ub913.c index 4bfa3b3cf619..8e9ebed09f64 100644 --- 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 dc394e22a42c..644022312833 100644 --- 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 8ba5750f5a23..b8f3e5ca03ef 100644 --- 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 16f19a640130..aac9cffe503c 100644 --- 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 b92348ad61f6..7b087be3ff4f 100644 --- 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) { @@ -431,6 +439,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, };
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> --- drivers/media/i2c/ds90ub913.c | 2 -- drivers/media/i2c/ds90ub953.c | 2 -- drivers/media/i2c/ds90ub960.c | 2 -- drivers/media/platform/nxp/imx-mipi-csis.c | 2 -- drivers/media/v4l2-core/v4l2-subdev.c | 9 +++++++++ 5 files changed, 9 insertions(+), 8 deletions(-)