iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: v4l2-subdev: Drop .set_mbus_config() operation

Browse Source 
The .set_mbus_config() operation is deprecated, and nothing in the
kernel uses it. Drop it.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
Laurent Pinchart 2022-01-03 17:24:09 +01:00 committed by Mauro Carvalho Chehab
parent b4bdc64613
commit a299299963
3 changed files with 7 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -318,13 +318,6 @@ static int call_get_mbus_config(struct v4l2_subdev *sd, unsigned int pad,
sd->ops->pad->get_mbus_config(sd, pad, config); sd->ops->pad->get_mbus_config(sd, pad, config);
} }
static int call_set_mbus_config(struct v4l2_subdev *sd, unsigned int pad,
struct v4l2_mbus_config *config)
{
return check_pad(sd, pad) ? :
sd->ops->pad->get_mbus_config(sd, pad, config);
}
static const struct v4l2_subdev_pad_ops v4l2_subdev_call_pad_wrappers = { static const struct v4l2_subdev_pad_ops v4l2_subdev_call_pad_wrappers = {
.get_fmt = call_get_fmt, .get_fmt = call_get_fmt,
.set_fmt = call_set_fmt, .set_fmt = call_set_fmt,
@ -338,7 +331,6 @@ static const struct v4l2_subdev_pad_ops v4l2_subdev_call_pad_wrappers = {
.dv_timings_cap = call_dv_timings_cap, .dv_timings_cap = call_dv_timings_cap,
.enum_dv_timings = call_enum_dv_timings, .enum_dv_timings = call_enum_dv_timings,
.get_mbus_config = call_get_mbus_config, .get_mbus_config = call_get_mbus_config,
.set_mbus_config = call_set_mbus_config,
}; };
static const struct v4l2_subdev_video_ops v4l2_subdev_call_video_wrappers = { static const struct v4l2_subdev_video_ops v4l2_subdev_call_video_wrappers = {

15
include/media/v4l2-mediabus.h
View File

@ -15,15 +15,14 @@
* How to use the V4L2_MBUS_* flags: * How to use the V4L2_MBUS_* flags:
* Flags are defined for each of the possible states and values of a media * Flags are defined for each of the possible states and values of a media
* bus configuration parameter. One and only one bit of each group of flags * bus configuration parameter. One and only one bit of each group of flags
* shall be set by the users of the v4l2_subdev_pad_ops.get_mbus_config and * shall be set by the users of the v4l2_subdev_pad_ops.get_mbus_config
* v4l2_subdev_pad_ops.set_mbus_config operations to ensure that no * operation to ensure that no conflicting settings are specified when
* conflicting settings are specified when reporting and setting the media bus * reporting the media bus configuration. For example, it is invalid to set or
* configuration with the two operations respectively. For example, it is * clear both the V4L2_MBUS_HSYNC_ACTIVE_HIGH and the
* invalid to set or clear both the V4L2_MBUS_HSYNC_ACTIVE_HIGH and the
* V4L2_MBUS_HSYNC_ACTIVE_LOW flag at the same time. Instead either flag * V4L2_MBUS_HSYNC_ACTIVE_LOW flag at the same time. Instead either flag
* V4L2_MBUS_HSYNC_ACTIVE_HIGH or flag V4L2_MBUS_HSYNC_ACTIVE_LOW shall be * V4L2_MBUS_HSYNC_ACTIVE_HIGH or flag V4L2_MBUS_HSYNC_ACTIVE_LOW shall be set.
* set. The same is true for the V4L2_MBUS_CSI2_1/2/3/4_LANE flags group: only * The same is true for the V4L2_MBUS_CSI2_1/2/3/4_LANE flags group: only one
* one of these four bits shall be set. * of these four bits shall be set.
* *
* TODO: replace the existing V4L2_MBUS_* flags with structures of fields * TODO: replace the existing V4L2_MBUS_* flags with structures of fields
* to avoid conflicting settings. * to avoid conflicting settings.

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

@ -715,17 +715,6 @@ struct v4l2_subdev_state {
* this operation as close as possible to stream on time. The * this operation as close as possible to stream on time. The
* operation shall fail if the pad index it has been called on * operation shall fail if the pad index it has been called on
* is not valid or in case of unrecoverable failures. * is not valid or in case of unrecoverable failures.
*
* @set_mbus_config: set the media bus configuration of a remote sub-device.
* This operations is intended to allow, in combination with
* the get_mbus_config operation, the negotiation of media bus
* configuration parameters between media sub-devices. The
* operation shall not fail if the requested configuration is
* not supported, but the driver shall update the content of
* the %config argument to reflect what has been actually
* applied to the hardware. The operation shall fail if the
* pad index it has been called on is not valid or in case of
* unrecoverable failures.
*/ */
struct v4l2_subdev_pad_ops { struct v4l2_subdev_pad_ops {
int (*init_cfg)(struct v4l2_subdev *sd, int (*init_cfg)(struct v4l2_subdev *sd,
@ -768,8 +757,6 @@ struct v4l2_subdev_pad_ops {
struct v4l2_mbus_frame_desc *fd); struct v4l2_mbus_frame_desc *fd);
int (*get_mbus_config)(struct v4l2_subdev *sd, unsigned int pad, int (*get_mbus_config)(struct v4l2_subdev *sd, unsigned int pad,
struct v4l2_mbus_config *config); struct v4l2_mbus_config *config);
int (*set_mbus_config)(struct v4l2_subdev *sd, unsigned int pad,
struct v4l2_mbus_config *config);
}; };
/** /**