All usages of v4l2_subdev_state_xlate_streams() have been replaced with v4l2_subdev_routing_xlate_streams(), remove it. Signed-off-by: Cosmin Tanislav <demonsingur@xxxxxxxxx> --- drivers/media/v4l2-core/v4l2-subdev.c | 7 ------- include/media/v4l2-subdev.h | 14 -------------- 2 files changed, 21 deletions(-) diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c index 91fa51259237e..985d30c22acae 100644 --- a/drivers/media/v4l2-core/v4l2-subdev.c +++ b/drivers/media/v4l2-core/v4l2-subdev.c @@ -2069,13 +2069,6 @@ u64 v4l2_subdev_routing_xlate_streams(const struct v4l2_subdev_krouting *routing } EXPORT_SYMBOL_GPL(v4l2_subdev_routing_xlate_streams); -u64 v4l2_subdev_state_xlate_streams(const struct v4l2_subdev_state *state, - u32 pad0, u32 pad1, u64 *streams) -{ - return v4l2_subdev_routing_xlate_streams(&state->routing, pad0, pad1, streams); -} -EXPORT_SYMBOL_GPL(v4l2_subdev_state_xlate_streams); - int v4l2_subdev_routing_validate(struct v4l2_subdev *sd, const struct v4l2_subdev_krouting *routing, enum v4l2_subdev_routing_restriction disallow) diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h index e49dba3c59bd6..0fa732e6dd55d 100644 --- a/include/media/v4l2-subdev.h +++ b/include/media/v4l2-subdev.h @@ -1606,20 +1606,6 @@ v4l2_subdev_state_get_opposite_stream_format(struct v4l2_subdev_state *state, u64 v4l2_subdev_routing_xlate_streams(const struct v4l2_subdev_krouting *routing, u32 pad0, u32 pad1, u64 *streams); -/** - * v4l2_subdev_state_xlate_streams() - Translate streams from one pad to another - * - * @state: Subdevice state - * @pad0: The first pad - * @pad1: The second pad - * @streams: Streams bitmask on the first pad - * - * This is the same as v4l2_subdev_routing_xlate_streams, but takes subdevice - * state as parameter - */ -u64 v4l2_subdev_state_xlate_streams(const struct v4l2_subdev_state *state, - u32 pad0, u32 pad1, u64 *streams); - /** * enum v4l2_subdev_routing_restriction - Subdevice internal routing restrictions * -- 2.48.1