Use the new v4l2_get_frame_desc_passthrough helper for .get_frame_desc.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen+renesas@xxxxxxxxxxxxxxxx>
---
drivers/media/i2c/ds90ub913.c | 59 +------------------------------------------
1 file changed, 1 insertion(+), 58 deletions(-)
diff --git a/drivers/media/i2c/ds90ub913.c b/drivers/media/i2c/ds90ub913.c
index fd2d2d5272bf..9ae761d7e3a5 100644
--- a/drivers/media/i2c/ds90ub913.c
+++ b/drivers/media/i2c/ds90ub913.c
@@ -358,63 +358,6 @@ static int ub913_set_routing(struct v4l2_subdev *sd,
return _ub913_set_routing(sd, state, routing);
}
-static int ub913_get_frame_desc(struct v4l2_subdev *sd, unsigned int pad,
- struct v4l2_mbus_frame_desc *fd)
-{
- struct ub913_data *priv = sd_to_ub913(sd);
- const struct v4l2_subdev_krouting *routing;
- struct v4l2_mbus_frame_desc source_fd;
- struct v4l2_subdev_route *route;
- struct v4l2_subdev_state *state;
- int ret;
-
- if (pad != UB913_PAD_SOURCE)
- return -EINVAL;
-
- ret = v4l2_subdev_call(priv->source_sd, pad, get_frame_desc,
- priv->source_sd_pad, &source_fd);
- if (ret)
- return ret;
-
- fd->type = V4L2_MBUS_FRAME_DESC_TYPE_PARALLEL;
-
- state = v4l2_subdev_lock_and_get_active_state(sd);
-
- routing = &state->routing;
-
- for_each_active_route(routing, route) {
- unsigned int i;
-
- if (route->source_pad != pad)
- continue;
-
- for (i = 0; i < source_fd.num_entries; i++) {
- if (source_fd.entry[i].stream == route->sink_stream)
- break;
- }
-
- if (i == source_fd.num_entries) {
- dev_err(&priv->client->dev,
- "Failed to find stream from source frame desc\n");
- ret = -EPIPE;
- goto out_unlock;
- }
-
- fd->entry[fd->num_entries].stream = route->source_stream;
- fd->entry[fd->num_entries].flags = source_fd.entry[i].flags;
- fd->entry[fd->num_entries].length = source_fd.entry[i].length;
- fd->entry[fd->num_entries].pixelcode =
- source_fd.entry[i].pixelcode;
-
- fd->num_entries++;
- }
-
-out_unlock:
- v4l2_subdev_unlock_state(state);
-
- return ret;
-}
-
static int ub913_set_fmt(struct v4l2_subdev *sd,
struct v4l2_subdev_state *state,
struct v4l2_subdev_format *format)
@@ -514,7 +457,7 @@ static const struct v4l2_subdev_pad_ops ub913_pad_ops = {
.enable_streams = ub913_enable_streams,
.disable_streams = ub913_disable_streams,
.set_routing = ub913_set_routing,
- .get_frame_desc = ub913_get_frame_desc,
+ .get_frame_desc = v4l2_get_frame_desc_passthrough,
.get_fmt = v4l2_subdev_get_fmt,
.set_fmt = ub913_set_fmt,
};
--
2.43.0
