| Message ID | 20211216131510.12308-2-laurent.pinchart+renesas@ideasonboard.com (mailing list archive) |
|---|---|
| State | New |
| Delegated to: | Kieran Bingham |
| Headers | show |
| Series | v4l: Proposed improvements for muxed streams v10 | expand |
Hi Laurent, On Thu, Dec 16, 2021 at 03:15:09PM +0200, Laurent Pinchart wrote: > The v4l2_state_get_stream_format() function operates on a subdev state, > rename it accordingly to v4l2_subdev_state_get_stream_format(). No need for a formal ack as I assume this will go in Tomi's v11 (if he likes the patch ofc). But in any case, it makes sense to me Reviewed-by: Jacopo Mondi <jacopo+renesas@jmondi.org> Thanks j > > Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > --- > drivers/media/v4l2-core/v4l2-subdev.c | 14 ++++++++------ > include/media/v4l2-subdev.h | 6 +++--- > 2 files changed, 11 insertions(+), 9 deletions(-) > > diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c > index dca2bea180ec..73ee7f01838f 100644 > --- a/drivers/media/v4l2-core/v4l2-subdev.c > +++ b/drivers/media/v4l2-core/v4l2-subdev.c > @@ -179,7 +179,7 @@ static int check_state_pad_stream(struct v4l2_subdev *sd, > */ > v4l2_subdev_lock_state(state); > > - fmt = v4l2_state_get_stream_format(state, pad, stream); > + fmt = v4l2_subdev_state_get_stream_format(state, pad, stream); > > v4l2_subdev_unlock_state(state); > > @@ -1492,8 +1492,8 @@ int v4l2_subdev_set_routing_with_fmt(struct v4l2_subdev *sd, > EXPORT_SYMBOL_GPL(v4l2_subdev_set_routing_with_fmt); > > struct v4l2_mbus_framefmt * > -v4l2_state_get_stream_format(struct v4l2_subdev_state *state, unsigned int pad, > - u32 stream) > +v4l2_subdev_state_get_stream_format(struct v4l2_subdev_state *state, > + unsigned int pad, u32 stream) > { > struct v4l2_subdev_stream_configs *stream_configs; > unsigned int i; > @@ -1510,7 +1510,7 @@ v4l2_state_get_stream_format(struct v4l2_subdev_state *state, unsigned int pad, > > return NULL; > } > -EXPORT_SYMBOL_GPL(v4l2_state_get_stream_format); > +EXPORT_SYMBOL_GPL(v4l2_subdev_state_get_stream_format); > > int v4l2_subdev_routing_find_opposite_end(const struct v4l2_subdev_krouting *routing, > u32 pad, u32 stream, u32 *other_pad, > @@ -1555,7 +1555,8 @@ v4l2_subdev_state_get_opposite_stream_format(struct v4l2_subdev_state *state, > if (ret) > return NULL; > > - return v4l2_state_get_stream_format(state, other_pad, other_stream); > + return v4l2_subdev_state_get_stream_format(state, other_pad, > + other_stream); > } > EXPORT_SYMBOL_GPL(v4l2_subdev_state_get_opposite_stream_format); > > @@ -1566,7 +1567,8 @@ int v4l2_subdev_get_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_state *state, > > v4l2_subdev_lock_state(state); > > - fmt = v4l2_state_get_stream_format(state, format->pad, format->stream); > + fmt = v4l2_subdev_state_get_stream_format(state, format->pad, > + format->stream); > if (!fmt) { > v4l2_subdev_unlock_state(state); > return -EINVAL; > diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h > index 9754913b34f8..aff1fb3a30d5 100644 > --- a/include/media/v4l2-subdev.h > +++ b/include/media/v4l2-subdev.h > @@ -1505,7 +1505,7 @@ int v4l2_subdev_set_routing_with_fmt(struct v4l2_subdev *sd, > const struct v4l2_mbus_framefmt *fmt); > > /** > - * v4l2_state_get_stream_format() - Get pointer to a stream format > + * v4l2_subdev_state_get_stream_format() - Get pointer to a stream format > * @state: subdevice state > * @pad: pad id > * @stream: stream id > @@ -1516,8 +1516,8 @@ int v4l2_subdev_set_routing_with_fmt(struct v4l2_subdev *sd, > * If the state does not contain the given pad + stream, NULL is returned. > */ > struct v4l2_mbus_framefmt * > -v4l2_state_get_stream_format(struct v4l2_subdev_state *state, unsigned int pad, > - u32 stream); > +v4l2_subdev_state_get_stream_format(struct v4l2_subdev_state *state, > + unsigned int pad, u32 stream); > > /** > * v4l2_subdev_routing_find_opposite_end() - Find the opposite stream > -- > Regards, > > Laurent Pinchart >
diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c index dca2bea180ec..73ee7f01838f 100644 --- a/drivers/media/v4l2-core/v4l2-subdev.c +++ b/drivers/media/v4l2-core/v4l2-subdev.c @@ -179,7 +179,7 @@ static int check_state_pad_stream(struct v4l2_subdev *sd, */ v4l2_subdev_lock_state(state); - fmt = v4l2_state_get_stream_format(state, pad, stream); + fmt = v4l2_subdev_state_get_stream_format(state, pad, stream); v4l2_subdev_unlock_state(state); @@ -1492,8 +1492,8 @@ int v4l2_subdev_set_routing_with_fmt(struct v4l2_subdev *sd, EXPORT_SYMBOL_GPL(v4l2_subdev_set_routing_with_fmt); struct v4l2_mbus_framefmt * -v4l2_state_get_stream_format(struct v4l2_subdev_state *state, unsigned int pad, - u32 stream) +v4l2_subdev_state_get_stream_format(struct v4l2_subdev_state *state, + unsigned int pad, u32 stream) { struct v4l2_subdev_stream_configs *stream_configs; unsigned int i; @@ -1510,7 +1510,7 @@ v4l2_state_get_stream_format(struct v4l2_subdev_state *state, unsigned int pad, return NULL; } -EXPORT_SYMBOL_GPL(v4l2_state_get_stream_format); +EXPORT_SYMBOL_GPL(v4l2_subdev_state_get_stream_format); int v4l2_subdev_routing_find_opposite_end(const struct v4l2_subdev_krouting *routing, u32 pad, u32 stream, u32 *other_pad, @@ -1555,7 +1555,8 @@ v4l2_subdev_state_get_opposite_stream_format(struct v4l2_subdev_state *state, if (ret) return NULL; - return v4l2_state_get_stream_format(state, other_pad, other_stream); + return v4l2_subdev_state_get_stream_format(state, other_pad, + other_stream); } EXPORT_SYMBOL_GPL(v4l2_subdev_state_get_opposite_stream_format); @@ -1566,7 +1567,8 @@ int v4l2_subdev_get_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_state *state, v4l2_subdev_lock_state(state); - fmt = v4l2_state_get_stream_format(state, format->pad, format->stream); + fmt = v4l2_subdev_state_get_stream_format(state, format->pad, + format->stream); if (!fmt) { v4l2_subdev_unlock_state(state); return -EINVAL; diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h index 9754913b34f8..aff1fb3a30d5 100644 --- a/include/media/v4l2-subdev.h +++ b/include/media/v4l2-subdev.h @@ -1505,7 +1505,7 @@ int v4l2_subdev_set_routing_with_fmt(struct v4l2_subdev *sd, const struct v4l2_mbus_framefmt *fmt); /** - * v4l2_state_get_stream_format() - Get pointer to a stream format + * v4l2_subdev_state_get_stream_format() - Get pointer to a stream format * @state: subdevice state * @pad: pad id * @stream: stream id @@ -1516,8 +1516,8 @@ int v4l2_subdev_set_routing_with_fmt(struct v4l2_subdev *sd, * If the state does not contain the given pad + stream, NULL is returned. */ struct v4l2_mbus_framefmt * -v4l2_state_get_stream_format(struct v4l2_subdev_state *state, unsigned int pad, - u32 stream); +v4l2_subdev_state_get_stream_format(struct v4l2_subdev_state *state, + unsigned int pad, u32 stream); /** * v4l2_subdev_routing_find_opposite_end() - Find the opposite stream
The v4l2_state_get_stream_format() function operates on a subdev state, rename it accordingly to v4l2_subdev_state_get_stream_format(). Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> --- drivers/media/v4l2-core/v4l2-subdev.c | 14 ++++++++------ include/media/v4l2-subdev.h | 6 +++--- 2 files changed, 11 insertions(+), 9 deletions(-)