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

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

V4L/DVB (11363): tvp5150: remove i2c legacy code. 



All drivers that use tvp5150 now use v4l2_subdev, so we can remove the
legacy code from tvp5150.

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

drivers/media/video/tvp5150.c

+1 −16
Original line number Original line Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include <linux/delay.h>

#include <linux/delay.h>

#include <media/v4l2-device.h>

#include <media/v4l2-device.h>

#include <media/tvp5150.h>

#include <media/tvp5150.h>

#include <media/v4l2-i2c-drv-legacy.h>

#include <media/v4l2-i2c-drv.h>

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

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





#include "tvp5150_reg.h"

#include "tvp5150_reg.h"
@@ -19,14 +19,6 @@ MODULE_DESCRIPTION("Texas Instruments TVP5150A video decoder driver"); 
MODULE_AUTHOR("Mauro Carvalho Chehab");

MODULE_AUTHOR("Mauro Carvalho Chehab");

MODULE_LICENSE("GPL");

MODULE_LICENSE("GPL");





/* standard i2c insmod options */

static unsigned short normal_i2c[] = {

	0xb8 >> 1,

	0xba >> 1,

	I2C_CLIENT_END

};



I2C_CLIENT_INSMOD;





static int debug;

static int debug;

module_param(debug, int, 0);

module_param(debug, int, 0);
@@ -1026,11 +1018,6 @@ static int tvp5150_queryctrl(struct v4l2_subdev *sd, struct v4l2_queryctrl *qc) 
	return -EINVAL;

	return -EINVAL;

}

}





static int tvp5150_command(struct i2c_client *client, unsigned cmd, void *arg)

{

	return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);

}



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

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





static const struct v4l2_subdev_core_ops tvp5150_core_ops = {

static const struct v4l2_subdev_core_ops tvp5150_core_ops = {
@@ -1125,9 +1112,7 @@ MODULE_DEVICE_TABLE(i2c, tvp5150_id); 




static struct v4l2_i2c_driver_data v4l2_i2c_data = {

static struct v4l2_i2c_driver_data v4l2_i2c_data = {

	.name = "tvp5150",

	.name = "tvp5150",

	.command = tvp5150_command,

	.probe = tvp5150_probe,

	.probe = tvp5150_probe,

	.remove = tvp5150_remove,

	.remove = tvp5150_remove,

	.legacy_class = I2C_CLASS_TV_ANALOG | I2C_CLASS_TV_DIGITAL,

	.id_table = tvp5150_id,

	.id_table = tvp5150_id,

};
 
};