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

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

[media] media/i2c: remove g_chip_ident op 



This is no longer needed since the core now handles this through DBG_G_CHIP_INFO.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarLad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 6be89daa

drivers/media/i2c/ad9389b.c

+2 −19
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#include <linux/workqueue.h>

#include <linux/v4l2-dv-timings.h>

#include <media/v4l2-device.h>

#include <media/v4l2-chip-ident.h>

#include <media/v4l2-common.h>

#include <media/v4l2-ctrls.h>

#include <media/ad9389b.h>
@@ -343,10 +342,6 @@ static const struct v4l2_ctrl_ops ad9389b_ctrl_ops = { 
#ifdef CONFIG_VIDEO_ADV_DEBUG

static int ad9389b_g_register(struct v4l2_subdev *sd, struct v4l2_dbg_register *reg)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);



	if (!v4l2_chip_match_i2c_client(client, &reg->match))

		return -EINVAL;

	reg->val = ad9389b_rd(sd, reg->reg & 0xff);

	reg->size = 1;

	return 0;
@@ -354,22 +349,11 @@ static int ad9389b_g_register(struct v4l2_subdev *sd, struct v4l2_dbg_register * 


static int ad9389b_s_register(struct v4l2_subdev *sd, const struct v4l2_dbg_register *reg)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);



	if (!v4l2_chip_match_i2c_client(client, &reg->match))

		return -EINVAL;

	ad9389b_wr(sd, reg->reg & 0xff, reg->val & 0xff);

	return 0;

}

#endif



static int ad9389b_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident *chip)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);



	return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_AD9389B, 0);

}



static int ad9389b_log_status(struct v4l2_subdev *sd)

{

	struct ad9389b_state *state = get_ad9389b_state(sd);
@@ -596,7 +580,6 @@ static int ad9389b_isr(struct v4l2_subdev *sd, u32 status, bool *handled) 


static const struct v4l2_subdev_core_ops ad9389b_core_ops = {

	.log_status = ad9389b_log_status,

	.g_chip_ident = ad9389b_g_chip_ident,

#ifdef CONFIG_VIDEO_ADV_DEBUG

	.g_register = ad9389b_g_register,

	.s_register = ad9389b_s_register,
@@ -1303,8 +1286,8 @@ static int ad9389b_remove(struct i2c_client *client) 
/* ----------------------------------------------------------------------- */



static struct i2c_device_id ad9389b_id[] = {

	{ "ad9389b", V4L2_IDENT_AD9389B },

	{ "ad9889b", V4L2_IDENT_AD9389B },

	{ "ad9389b", 0 },

	{ "ad9889b", 0 },

	{ }

};

MODULE_DEVICE_TABLE(i2c, ad9389b_id);

drivers/media/i2c/adv7170.c

+0 −13
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 
#include <linux/i2c.h>

#include <linux/videodev2.h>

#include <media/v4l2-device.h>

#include <media/v4l2-chip-ident.h>



MODULE_DESCRIPTION("Analog Devices ADV7170 video encoder driver");

MODULE_AUTHOR("Maxim Yevtyushkin");
@@ -317,19 +316,8 @@ static int adv7170_s_fmt(struct v4l2_subdev *sd, 
	return ret;

}



static int adv7170_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident *chip)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);



	return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_ADV7170, 0);

}



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



static const struct v4l2_subdev_core_ops adv7170_core_ops = {

	.g_chip_ident = adv7170_g_chip_ident,

};



static const struct v4l2_subdev_video_ops adv7170_video_ops = {

	.s_std_output = adv7170_s_std_output,

	.s_routing = adv7170_s_routing,
@@ -339,7 +327,6 @@ static const struct v4l2_subdev_video_ops adv7170_video_ops = { 
};



static const struct v4l2_subdev_ops adv7170_ops = {

	.core = &adv7170_core_ops,

	.video = &adv7170_video_ops,

};

drivers/media/i2c/adv7175.c

+0 −9
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#include <linux/i2c.h>

#include <linux/videodev2.h>

#include <media/v4l2-device.h>

#include <media/v4l2-chip-ident.h>



MODULE_DESCRIPTION("Analog Devices ADV7175 video encoder driver");

MODULE_AUTHOR("Dave Perks");
@@ -355,13 +354,6 @@ static int adv7175_s_fmt(struct v4l2_subdev *sd, 
	return ret;

}



static int adv7175_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident *chip)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);



	return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_ADV7175, 0);

}



static int adv7175_s_power(struct v4l2_subdev *sd, int on)

{

	if (on)
@@ -375,7 +367,6 @@ static int adv7175_s_power(struct v4l2_subdev *sd, int on) 
/* ----------------------------------------------------------------------- */



static const struct v4l2_subdev_core_ops adv7175_core_ops = {

	.g_chip_ident = adv7175_g_chip_ident,

	.init = adv7175_init,

	.s_power = adv7175_s_power,

};

drivers/media/i2c/adv7180.c

+0 −10
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include <linux/videodev2.h>

#include <media/v4l2-device.h>

#include <media/v4l2-ctrls.h>

#include <media/v4l2-chip-ident.h>

#include <linux/mutex.h>



#define ADV7180_INPUT_CONTROL_REG			0x00
@@ -274,14 +273,6 @@ static int adv7180_g_input_status(struct v4l2_subdev *sd, u32 *status) 
	return ret;

}



static int adv7180_g_chip_ident(struct v4l2_subdev *sd,

				struct v4l2_dbg_chip_ident *chip)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);



	return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_ADV7180, 0);

}



static int adv7180_s_std(struct v4l2_subdev *sd, v4l2_std_id std)

{

	struct adv7180_state *state = to_state(sd);
@@ -450,7 +441,6 @@ static const struct v4l2_subdev_video_ops adv7180_video_ops = { 
};



static const struct v4l2_subdev_core_ops adv7180_core_ops = {

	.g_chip_ident = adv7180_g_chip_ident,

	.s_std = adv7180_s_std,

};

drivers/media/i2c/adv7183.c

+0 −22
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include <linux/videodev2.h>



#include <media/adv7183.h>

#include <media/v4l2-chip-ident.h>

#include <media/v4l2-ctrls.h>

#include <media/v4l2-device.h>
@@ -481,25 +480,9 @@ static int adv7183_s_stream(struct v4l2_subdev *sd, int enable) 
	return 0;

}



static int adv7183_g_chip_ident(struct v4l2_subdev *sd,

		struct v4l2_dbg_chip_ident *chip)

{

	int rev;

	struct i2c_client *client = v4l2_get_subdevdata(sd);



	/* 0x11 for adv7183, 0x13 for adv7183b */

	rev = adv7183_read(sd, ADV7183_IDENT);



	return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_ADV7183, rev);

}



#ifdef CONFIG_VIDEO_ADV_DEBUG

static int adv7183_g_register(struct v4l2_subdev *sd, struct v4l2_dbg_register *reg)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);



	if (!v4l2_chip_match_i2c_client(client, &reg->match))

		return -EINVAL;

	reg->val = adv7183_read(sd, reg->reg & 0xff);

	reg->size = 1;

	return 0;
@@ -507,10 +490,6 @@ static int adv7183_g_register(struct v4l2_subdev *sd, struct v4l2_dbg_register * 


static int adv7183_s_register(struct v4l2_subdev *sd, const struct v4l2_dbg_register *reg)

{

	struct i2c_client *client = v4l2_get_subdevdata(sd);



	if (!v4l2_chip_match_i2c_client(client, &reg->match))

		return -EINVAL;

	adv7183_write(sd, reg->reg & 0xff, reg->val & 0xff);

	return 0;

}
@@ -525,7 +504,6 @@ static const struct v4l2_subdev_core_ops adv7183_core_ops = { 
	.g_std = adv7183_g_std,

	.s_std = adv7183_s_std,

	.reset = adv7183_reset,

	.g_chip_ident = adv7183_g_chip_ident,

#ifdef CONFIG_VIDEO_ADV_DEBUG

	.g_register = adv7183_g_register,

	.s_register = adv7183_s_register,