diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-02-18 17:23:43 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 11:43:11 -0400 |
commit | a0720d3b7b80163150fde73aa43ba8fcd417b9cb (patch) | |
tree | 81538debd41124764a838544ac6b5d377920aec9 /drivers/media/video/saa7191.c | |
parent | 48f4dacb6759d6357036e2a37434bf8bade119c9 (diff) |
V4L/DVB (10866): saa7191, indycam: remove compat code.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/saa7191.c')
-rw-r--r-- | drivers/media/video/saa7191.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/drivers/media/video/saa7191.c b/drivers/media/video/saa7191.c index 40ae2787326f..2e6fce5b51fd 100644 --- a/drivers/media/video/saa7191.c +++ b/drivers/media/video/saa7191.c | |||
@@ -23,7 +23,7 @@ | |||
23 | #include <linux/i2c.h> | 23 | #include <linux/i2c.h> |
24 | #include <media/v4l2-device.h> | 24 | #include <media/v4l2-device.h> |
25 | #include <media/v4l2-chip-ident.h> | 25 | #include <media/v4l2-chip-ident.h> |
26 | #include <media/v4l2-i2c-drv-legacy.h> | 26 | #include <media/v4l2-i2c-drv.h> |
27 | 27 | ||
28 | #include "saa7191.h" | 28 | #include "saa7191.h" |
29 | 29 | ||
@@ -34,9 +34,6 @@ MODULE_VERSION(SAA7191_MODULE_VERSION); | |||
34 | MODULE_AUTHOR("Mikael Nousiainen <tmnousia@cc.hut.fi>"); | 34 | MODULE_AUTHOR("Mikael Nousiainen <tmnousia@cc.hut.fi>"); |
35 | MODULE_LICENSE("GPL"); | 35 | MODULE_LICENSE("GPL"); |
36 | 36 | ||
37 | static unsigned short normal_i2c[] = { 0x8a >> 1, 0x8e >> 1, I2C_CLIENT_END }; | ||
38 | |||
39 | I2C_CLIENT_INSMOD; | ||
40 | 37 | ||
41 | // #define SAA7191_DEBUG | 38 | // #define SAA7191_DEBUG |
42 | 39 | ||
@@ -579,11 +576,6 @@ static int saa7191_g_chip_ident(struct v4l2_subdev *sd, | |||
579 | return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_SAA7191, 0); | 576 | return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_SAA7191, 0); |
580 | } | 577 | } |
581 | 578 | ||
582 | static int saa7191_command(struct i2c_client *client, unsigned cmd, void *arg) | ||
583 | { | ||
584 | return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg); | ||
585 | } | ||
586 | |||
587 | /* ----------------------------------------------------------------------- */ | 579 | /* ----------------------------------------------------------------------- */ |
588 | 580 | ||
589 | static const struct v4l2_subdev_core_ops saa7191_core_ops = { | 581 | static const struct v4l2_subdev_core_ops saa7191_core_ops = { |
@@ -652,11 +644,6 @@ static int saa7191_remove(struct i2c_client *client) | |||
652 | return 0; | 644 | return 0; |
653 | } | 645 | } |
654 | 646 | ||
655 | static int saa7191_legacy_probe(struct i2c_adapter *adapter) | ||
656 | { | ||
657 | return adapter->id == I2C_HW_SGI_VINO; | ||
658 | } | ||
659 | |||
660 | static const struct i2c_device_id saa7191_id[] = { | 647 | static const struct i2c_device_id saa7191_id[] = { |
661 | { "saa7191", 0 }, | 648 | { "saa7191", 0 }, |
662 | { } | 649 | { } |
@@ -665,10 +652,7 @@ MODULE_DEVICE_TABLE(i2c, saa7191_id); | |||
665 | 652 | ||
666 | static struct v4l2_i2c_driver_data v4l2_i2c_data = { | 653 | static struct v4l2_i2c_driver_data v4l2_i2c_data = { |
667 | .name = "saa7191", | 654 | .name = "saa7191", |
668 | .driverid = I2C_DRIVERID_SAA7191, | ||
669 | .command = saa7191_command, | ||
670 | .probe = saa7191_probe, | 655 | .probe = saa7191_probe, |
671 | .remove = saa7191_remove, | 656 | .remove = saa7191_remove, |
672 | .legacy_probe = saa7191_legacy_probe, | ||
673 | .id_table = saa7191_id, | 657 | .id_table = saa7191_id, |
674 | }; | 658 | }; |