Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ec19898 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] v4l2: remove obsolete v4l2_chip_match_host() 



This function is no longer needed since it is now the responsibility of the
v4l2 core to check if the DBG_G/S_REGISTER and DBG_G_CHIP_INFO ioctls are
called for the bridge driver or not.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent facd2366

drivers/media/usb/usbvision/usbvision-video.c

+0 −4
Original line number Diff line number Diff line
@@ -467,8 +467,6 @@ static int vidioc_g_register(struct file *file, void *priv, 
	struct usb_usbvision *usbvision = video_drvdata(file);

	int err_code;



	if (!v4l2_chip_match_host(&reg->match))

		return -EINVAL;

	/* NT100x has a 8-bit register space */

	err_code = usbvision_read_reg(usbvision, reg->reg&0xff);

	if (err_code < 0) {
@@ -488,8 +486,6 @@ static int vidioc_s_register(struct file *file, void *priv, 
	struct usb_usbvision *usbvision = video_drvdata(file);

	int err_code;



	if (!v4l2_chip_match_host(&reg->match))

		return -EINVAL;

	/* NT100x has a 8-bit register space */

	err_code = usbvision_write_reg(usbvision, reg->reg & 0xff, reg->val);

	if (err_code < 0) {

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

+0 −11
Original line number Diff line number Diff line
@@ -227,17 +227,6 @@ u32 v4l2_ctrl_next(const u32 * const * ctrl_classes, u32 id) 
}

EXPORT_SYMBOL(v4l2_ctrl_next);



int v4l2_chip_match_host(const struct v4l2_dbg_match *match)

{

	switch (match->type) {

	case V4L2_CHIP_MATCH_BRIDGE:

		return match->addr == 0;

	default:

		return 0;

	}

}

EXPORT_SYMBOL(v4l2_chip_match_host);



#if IS_ENABLED(CONFIG_I2C)

int v4l2_chip_match_i2c_client(struct i2c_client *c, const struct v4l2_dbg_match *match)

{

include/media/v4l2-common.h

+0 −1
Original line number Diff line number Diff line
@@ -106,7 +106,6 @@ struct i2c_client; /* forward reference */ 
int v4l2_chip_match_i2c_client(struct i2c_client *c, const struct v4l2_dbg_match *match);

int v4l2_chip_ident_i2c_client(struct i2c_client *c, struct v4l2_dbg_chip_ident *chip,

		u32 ident, u32 revision);

int v4l2_chip_match_host(const struct v4l2_dbg_match *match);



/* ------------------------------------------------------------------------- */