Commit a2992999 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

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



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

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent b4bdc646

drivers/media/v4l2-core/v4l2-subdev.c

+0 −8
Original line number Diff line number Diff line
@@ -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);

}



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 = {

	.get_fmt		= call_get_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,

	.enum_dv_timings	= call_enum_dv_timings,

	.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 = {

include/media/v4l2-mediabus.h

+7 −8
Original line number Diff line number Diff line
@@ -15,15 +15,14 @@ 
 * How to use the V4L2_MBUS_* flags:

 * 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

 * shall be set by the users of the v4l2_subdev_pad_ops.get_mbus_config and

 * v4l2_subdev_pad_ops.set_mbus_config operations to ensure that no

 * conflicting settings are specified when reporting and setting the media bus

 * configuration with the two operations respectively. For example, it is

 * invalid to set or clear both the V4L2_MBUS_HSYNC_ACTIVE_HIGH and the

 * shall be set by the users of the v4l2_subdev_pad_ops.get_mbus_config

 * operation to ensure that no conflicting settings are specified when

 * reporting the media bus configuration. For example, it is 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_HIGH or flag V4L2_MBUS_HSYNC_ACTIVE_LOW shall be

 * set. The same is true for the V4L2_MBUS_CSI2_1/2/3/4_LANE flags group: only

 * one of these four bits shall be set.

 * V4L2_MBUS_HSYNC_ACTIVE_HIGH or flag V4L2_MBUS_HSYNC_ACTIVE_LOW shall be set.

 * The same is true for the V4L2_MBUS_CSI2_1/2/3/4_LANE flags group: only one

 * of these four bits shall be set.

 *

 * TODO: replace the existing V4L2_MBUS_* flags with structures of fields

 * to avoid conflicting settings.

include/media/v4l2-subdev.h

+0 −13
Original line number Diff line number Diff line
@@ -715,17 +715,6 @@ struct v4l2_subdev_state { 
 *		     this operation as close as possible to stream on time. The

 *		     operation shall fail if the pad index it has been called on

 *		     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 {

	int (*init_cfg)(struct v4l2_subdev *sd,
@@ -768,8 +757,6 @@ struct v4l2_subdev_pad_ops { 
			      struct v4l2_mbus_frame_desc *fd);

	int (*get_mbus_config)(struct v4l2_subdev *sd, unsigned int pad,

			       struct v4l2_mbus_config *config);

	int (*set_mbus_config)(struct v4l2_subdev *sd, unsigned int pad,

			       struct v4l2_mbus_config *config);

};



/**