mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

media: v4l: subdev: Rename sub-device state information access functions 

Rename the sub-devices state information access functions, removing
"_stream" from them and replacing "format" by "ffmt". This makes them
shorter and so more convenient to use. No other sets of functions will be
needed to access this information.

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: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
Sakari Ailus 2023-10-13 10:16:06 +02:00 committed by Mauro Carvalho Chehab
parent 049fa16b81
commit d0fde6aae2
6 changed files with 34 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/media/i2c/ds90ub913.c
View File

@ -424,8 +424,7 @@ static int ub913_set_fmt(struct v4l2_subdev *sd,
}
/* Set sink format */
fmt = v4l2_subdev_state_get_stream_format(state, format->pad,
format->stream);
fmt = v4l2_subdev_state_get_format(state, format->pad, format->stream);
if (!fmt)
return -EINVAL;

3
drivers/media/i2c/ds90ub953.c
View File

@ -558,8 +558,7 @@ static int ub953_set_fmt(struct v4l2_subdev *sd,
return v4l2_subdev_get_fmt(sd, state, format);
/* Set sink format */
fmt = v4l2_subdev_state_get_stream_format(state, format->pad,
format->stream);
fmt = v4l2_subdev_state_get_format(state, format->pad, format->stream);
if (!fmt)
return -EINVAL;

12
drivers/media/i2c/ds90ub960.c
View File

@ -2451,9 +2451,8 @@ static int ub960_configure_ports_for_streaming(struct ub960_data *priv,
if (rx_data[nport].num_streams > 2)
return -EPIPE;
fmt = v4l2_subdev_state_get_stream_format(state,
route->sink_pad,
route->sink_stream);
fmt = v4l2_subdev_state_get_format(state, route->sink_pad,
route->sink_stream);
if (!fmt)
return -EPIPE;
@ -2842,8 +2841,8 @@ static int ub960_get_frame_desc(struct v4l2_subdev *sd, unsigned int pad,
const struct ub960_format_info *ub960_fmt;
struct v4l2_mbus_framefmt *fmt;
fmt = v4l2_subdev_state_get_stream_format(state, pad,
route->source_stream);
fmt = v4l2_subdev_state_get_format(state, pad,
route->source_stream);
if (!fmt) {
ret = -EINVAL;
@ -2891,8 +2890,7 @@ static int ub960_set_fmt(struct v4l2_subdev *sd,
if (!ub960_find_format(format->format.code))
format->format.code = ub960_formats[0].code;
fmt = v4l2_subdev_state_get_stream_format(state, format->pad,
format->stream);
fmt = v4l2_subdev_state_get_format(state, format->pad, format->stream);
if (!fmt)
return -EINVAL;

10
drivers/media/platform/nxp/imx8-isi/imx8-isi-crossbar.c
View File

@ -58,7 +58,7 @@ static int mxc_isi_crossbar_gasket_enable(struct mxc_isi_crossbar *xbar,
return -EINVAL;
}
fmt = v4l2_subdev_state_get_stream_format(state, port, 0);
fmt = v4l2_subdev_state_get_format(state, port, 0);
if (!fmt)
return -EINVAL;
@ -281,8 +281,7 @@ static int mxc_isi_crossbar_set_fmt(struct v4l2_subdev *sd,
* Set the format on the sink stream and propagate it to the source
* streams.
*/
sink_fmt = v4l2_subdev_state_get_stream_format(state, fmt->pad,
fmt->stream);
sink_fmt = v4l2_subdev_state_get_format(state, fmt->pad, fmt->stream);
if (!sink_fmt)
return -EINVAL;
@ -296,8 +295,9 @@ static int mxc_isi_crossbar_set_fmt(struct v4l2_subdev *sd,
route->sink_stream != fmt->stream)
continue;
source_fmt = v4l2_subdev_state_get_stream_format(state, route->source_pad,
route->source_stream);
source_fmt = v4l2_subdev_state_get_format(state,
route->source_pad,
route->source_stream);
if (!source_fmt)
return -EINVAL;

27
drivers/media/v4l2-core/v4l2-subdev.c
View File

@ -177,7 +177,7 @@ static int check_state(struct v4l2_subdev *sd, struct v4l2_subdev_state *state,
{
if (sd->flags & V4L2_SUBDEV_FL_STREAMS) {
#if defined(CONFIG_VIDEO_V4L2_SUBDEV_API)
if (!v4l2_subdev_state_get_stream_format(state, pad, stream))
if (!v4l2_subdev_state_get_format(state, pad, stream))
return -EINVAL;
return 0;
#else
@ -1588,8 +1588,8 @@ int v4l2_subdev_get_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_state *state,
struct v4l2_mbus_framefmt *fmt;
if (sd->flags & V4L2_SUBDEV_FL_STREAMS)
fmt = v4l2_subdev_state_get_stream_format(state, format->pad,
format->stream);
fmt = v4l2_subdev_state_get_format(state, format->pad,
format->stream);
else if (format->pad < sd->entity.num_pads && format->stream == 0)
fmt = v4l2_subdev_get_pad_format(sd, state, format->pad);
else
@ -1685,8 +1685,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_subdev_state_get_stream_format(struct v4l2_subdev_state *state,
unsigned int pad, u32 stream)
v4l2_subdev_state_get_format(struct v4l2_subdev_state *state, unsigned int pad,
u32 stream)
{
struct v4l2_subdev_stream_configs *stream_configs;
unsigned int i;
@ -1724,11 +1724,11 @@ v4l2_subdev_state_get_stream_format(struct v4l2_subdev_state *state,
return NULL;
}
EXPORT_SYMBOL_GPL(v4l2_subdev_state_get_stream_format);
EXPORT_SYMBOL_GPL(v4l2_subdev_state_get_format);
struct v4l2_rect *
v4l2_subdev_state_get_stream_crop(struct v4l2_subdev_state *state,
unsigned int pad, u32 stream)
v4l2_subdev_state_get_crop(struct v4l2_subdev_state *state, unsigned int pad,
u32 stream)
{
struct v4l2_subdev_stream_configs *stream_configs;
unsigned int i;
@ -1766,11 +1766,11 @@ v4l2_subdev_state_get_stream_crop(struct v4l2_subdev_state *state,
return NULL;
}
EXPORT_SYMBOL_GPL(v4l2_subdev_state_get_stream_crop);
EXPORT_SYMBOL_GPL(v4l2_subdev_state_get_crop);
struct v4l2_rect *
v4l2_subdev_state_get_stream_compose(struct v4l2_subdev_state *state,
unsigned int pad, u32 stream)
v4l2_subdev_state_get_compose(struct v4l2_subdev_state *state, unsigned int pad,
u32 stream)
{
struct v4l2_subdev_stream_configs *stream_configs;
unsigned int i;
@ -1808,7 +1808,7 @@ v4l2_subdev_state_get_stream_compose(struct v4l2_subdev_state *state,
return NULL;
}
EXPORT_SYMBOL_GPL(v4l2_subdev_state_get_stream_compose);
EXPORT_SYMBOL_GPL(v4l2_subdev_state_get_compose);
int v4l2_subdev_routing_find_opposite_end(const struct v4l2_subdev_krouting *routing,
u32 pad, u32 stream, u32 *other_pad,
@ -1854,8 +1854,7 @@ v4l2_subdev_state_get_opposite_stream_format(struct v4l2_subdev_state *state,
if (ret)
return NULL;
return v4l2_subdev_state_get_stream_format(state, other_pad,
other_stream);
return v4l2_subdev_state_get_format(state, other_pad, other_stream);
}
EXPORT_SYMBOL_GPL(v4l2_subdev_state_get_opposite_stream_format);

19
include/media/v4l2-subdev.h
View File

@ -1535,7 +1535,7 @@ int v4l2_subdev_set_routing_with_fmt(struct v4l2_subdev *sd,
const struct v4l2_mbus_framefmt *fmt);
/**
* v4l2_subdev_state_get_stream_format() - Get pointer to a stream format
* v4l2_subdev_state_get_format() - Get pointer to a stream format
* @state: subdevice state
* @pad: pad id
* @stream: stream id
@ -1547,11 +1547,11 @@ int v4l2_subdev_set_routing_with_fmt(struct v4l2_subdev *sd,
* If the pad does not exist, NULL is returned.
*/
struct v4l2_mbus_framefmt *
v4l2_subdev_state_get_stream_format(struct v4l2_subdev_state *state,
unsigned int pad, u32 stream);
v4l2_subdev_state_get_format(struct v4l2_subdev_state *state, unsigned int pad,
u32 stream);
/**
* v4l2_subdev_state_get_stream_crop() - Get pointer to a stream crop rectangle
* v4l2_subdev_state_get_crop() - Get pointer to a stream crop rectangle
* @state: subdevice state
* @pad: pad id
* @stream: stream id
@ -1563,12 +1563,11 @@ v4l2_subdev_state_get_stream_format(struct v4l2_subdev_state *state,
* returned. If the pad does not exist, NULL is returned.
*/
struct v4l2_rect *
v4l2_subdev_state_get_stream_crop(struct v4l2_subdev_state *state,
unsigned int pad, u32 stream);
v4l2_subdev_state_get_crop(struct v4l2_subdev_state *state, unsigned int pad,
u32 stream);
/**
* v4l2_subdev_state_get_stream_compose() - Get pointer to a stream compose
* rectangle
* v4l2_subdev_state_get_compose() - Get pointer to a stream compose rectangle
* @state: subdevice state
* @pad: pad id
* @stream: stream id
@ -1580,8 +1579,8 @@ v4l2_subdev_state_get_stream_crop(struct v4l2_subdev_state *state,
* returned. If the pad does not exist, NULL is returned.
*/
struct v4l2_rect *
v4l2_subdev_state_get_stream_compose(struct v4l2_subdev_state *state,
unsigned int pad, u32 stream);
v4l2_subdev_state_get_compose(struct v4l2_subdev_state *state, unsigned int pad,
u32 stream);
/**
* v4l2_subdev_routing_find_opposite_end() - Find the opposite stream