aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7115.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-03-29 16:32:35 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-04-06 20:44:17 -0400
commitef6078e98e40170a8a3d4e6b205184a2ede87a02 (patch)
tree835c1376b6626c6dc54ae9e1b390e747a280a771 /drivers/media/video/saa7115.c
parent46e226742618cf3e33635536decdffd48f3f0ebe (diff)
V4L/DVB (11362): saa7115: remove i2c legacy code
All drivers that use saa7115 now use v4l2_subdev, so we can remove the legacy code from saa7115. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/saa7115.c')
-rw-r--r--drivers/media/video/saa7115.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index cebf159f52cf..5ee94d618695 100644
--- a/drivers/media/video/saa7115.c
+++ b/drivers/media/video/saa7115.c
@@ -46,7 +46,7 @@
46#include <linux/videodev2.h> 46#include <linux/videodev2.h>
47#include <media/v4l2-device.h> 47#include <media/v4l2-device.h>
48#include <media/v4l2-chip-ident.h> 48#include <media/v4l2-chip-ident.h>
49#include <media/v4l2-i2c-drv-legacy.h> 49#include <media/v4l2-i2c-drv.h>
50#include <media/saa7115.h> 50#include <media/saa7115.h>
51#include <asm/div64.h> 51#include <asm/div64.h>
52 52
@@ -62,12 +62,6 @@ module_param(debug, bool, 0644);
62 62
63MODULE_PARM_DESC(debug, "Debug level (0-1)"); 63MODULE_PARM_DESC(debug, "Debug level (0-1)");
64 64
65static unsigned short normal_i2c[] = {
66 0x4a >> 1, 0x48 >> 1, /* SAA7111, SAA7111A and SAA7113 */
67 0x42 >> 1, 0x40 >> 1, /* SAA7114, SAA7115 and SAA7118 */
68 I2C_CLIENT_END };
69
70I2C_CLIENT_INSMOD;
71 65
72struct saa711x_state { 66struct saa711x_state {
73 struct v4l2_subdev sd; 67 struct v4l2_subdev sd;
@@ -1498,11 +1492,6 @@ static int saa711x_log_status(struct v4l2_subdev *sd)
1498 return 0; 1492 return 0;
1499} 1493}
1500 1494
1501static int saa711x_command(struct i2c_client *client, unsigned cmd, void *arg)
1502{
1503 return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);
1504}
1505
1506/* ----------------------------------------------------------------------- */ 1495/* ----------------------------------------------------------------------- */
1507 1496
1508static const struct v4l2_subdev_core_ops saa711x_core_ops = { 1497static const struct v4l2_subdev_core_ops saa711x_core_ops = {
@@ -1676,8 +1665,6 @@ MODULE_DEVICE_TABLE(i2c, saa7115_id);
1676 1665
1677static struct v4l2_i2c_driver_data v4l2_i2c_data = { 1666static struct v4l2_i2c_driver_data v4l2_i2c_data = {
1678 .name = "saa7115", 1667 .name = "saa7115",
1679 .driverid = I2C_DRIVERID_SAA711X,
1680 .command = saa711x_command,
1681 .probe = saa711x_probe, 1668 .probe = saa711x_probe,
1682 .remove = saa711x_remove, 1669 .remove = saa711x_remove,
1683 .legacy_class = I2C_CLASS_TV_ANALOG | I2C_CLASS_TV_DIGITAL, 1670 .legacy_class = I2C_CLASS_TV_ANALOG | I2C_CLASS_TV_DIGITAL,