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

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

V4L/DVB (11371): v4l2: remove legacy fields in v4l2-i2c-drv.h. 



Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent f41737ec

drivers/media/video/saa7115.c

+0 −1
Original line number Diff line number Diff line
@@ -1667,6 +1667,5 @@ static struct v4l2_i2c_driver_data v4l2_i2c_data = { 
	.name = "saa7115",

	.probe = saa711x_probe,

	.remove = saa711x_remove,

	.legacy_class = I2C_CLASS_TV_ANALOG | I2C_CLASS_TV_DIGITAL,

	.id_table = saa7115_id,

};

drivers/media/video/tuner-core.c

+1 −1
Original line number Diff line number Diff line
@@ -1020,7 +1020,7 @@ static void tuner_lookup(struct i2c_adapter *adap, 
		int mode_mask;



		if (pos->i2c->adapter != adap ||

		    pos->i2c->driver->id != I2C_DRIVERID_TUNER)

		    strcmp(pos->i2c->driver->driver.name, "tuner"))

			continue;



		mode_mask = pos->mode_mask & ~T_STANDBY;

include/media/v4l2-i2c-drv.h

+0 −4
Original line number Diff line number Diff line
@@ -39,14 +39,11 @@ 


struct v4l2_i2c_driver_data {

	const char * const name;

	int driverid;

	int (*command)(struct i2c_client *client, unsigned int cmd, void *arg);

	int (*probe)(struct i2c_client *client, const struct i2c_device_id *id);

	int (*remove)(struct i2c_client *client);

	int (*suspend)(struct i2c_client *client, pm_message_t state);

	int (*resume)(struct i2c_client *client);

	int (*legacy_probe)(struct i2c_adapter *adapter);

	int legacy_class;

	const struct i2c_device_id *id_table;

};
@@ -59,7 +56,6 @@ static struct i2c_driver v4l2_i2c_driver; 
static int __init v4l2_i2c_drv_init(void)

{

	v4l2_i2c_driver.driver.name = v4l2_i2c_data.name;

	v4l2_i2c_driver.id = v4l2_i2c_data.driverid;

	v4l2_i2c_driver.command = v4l2_i2c_data.command;

	v4l2_i2c_driver.probe = v4l2_i2c_data.probe;

	v4l2_i2c_driver.remove = v4l2_i2c_data.remove;