diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-05-29 05:59:41 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-06-17 07:44:09 -0400 |
commit | 23898919c45ff5fc5d882ec6206b38a5fb6ecd88 (patch) | |
tree | 8270fad9b088c851631c5e2eb38996ad555ff324 | |
parent | 80f8568f47306dc4453bb6630ac607f22ca4c7b4 (diff) |
[media] saa6752hs: drop obsolete g_chip_ident
This op and the v4l2-chip-ident.h header are no longer needed.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/pci/saa7134/saa6752hs.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/media/pci/saa7134/saa6752hs.c b/drivers/media/pci/saa7134/saa6752hs.c index f147b05bd860..244b2868dfc8 100644 --- a/drivers/media/pci/saa7134/saa6752hs.c +++ b/drivers/media/pci/saa7134/saa6752hs.c | |||
@@ -35,7 +35,6 @@ | |||
35 | #include <linux/videodev2.h> | 35 | #include <linux/videodev2.h> |
36 | #include <media/v4l2-device.h> | 36 | #include <media/v4l2-device.h> |
37 | #include <media/v4l2-common.h> | 37 | #include <media/v4l2-common.h> |
38 | #include <media/v4l2-chip-ident.h> | ||
39 | #include <linux/init.h> | 38 | #include <linux/init.h> |
40 | #include <linux/crc32.h> | 39 | #include <linux/crc32.h> |
41 | 40 | ||
@@ -92,7 +91,6 @@ static const struct v4l2_format v4l2_format_table[] = | |||
92 | 91 | ||
93 | struct saa6752hs_state { | 92 | struct saa6752hs_state { |
94 | struct v4l2_subdev sd; | 93 | struct v4l2_subdev sd; |
95 | int chip; | ||
96 | u32 revision; | 94 | u32 revision; |
97 | int has_ac3; | 95 | int has_ac3; |
98 | struct saa6752hs_mpeg_params params; | 96 | struct saa6752hs_mpeg_params params; |
@@ -914,19 +912,9 @@ static int saa6752hs_s_std(struct v4l2_subdev *sd, v4l2_std_id std) | |||
914 | return 0; | 912 | return 0; |
915 | } | 913 | } |
916 | 914 | ||
917 | static int saa6752hs_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident *chip) | ||
918 | { | ||
919 | struct i2c_client *client = v4l2_get_subdevdata(sd); | ||
920 | struct saa6752hs_state *h = to_state(sd); | ||
921 | |||
922 | return v4l2_chip_ident_i2c_client(client, | ||
923 | chip, h->chip, h->revision); | ||
924 | } | ||
925 | |||
926 | /* ----------------------------------------------------------------------- */ | 915 | /* ----------------------------------------------------------------------- */ |
927 | 916 | ||
928 | static const struct v4l2_subdev_core_ops saa6752hs_core_ops = { | 917 | static const struct v4l2_subdev_core_ops saa6752hs_core_ops = { |
929 | .g_chip_ident = saa6752hs_g_chip_ident, | ||
930 | .init = saa6752hs_init, | 918 | .init = saa6752hs_init, |
931 | .queryctrl = saa6752hs_queryctrl, | 919 | .queryctrl = saa6752hs_queryctrl, |
932 | .querymenu = saa6752hs_querymenu, | 920 | .querymenu = saa6752hs_querymenu, |
@@ -963,11 +951,9 @@ static int saa6752hs_probe(struct i2c_client *client, | |||
963 | 951 | ||
964 | i2c_master_send(client, &addr, 1); | 952 | i2c_master_send(client, &addr, 1); |
965 | i2c_master_recv(client, data, sizeof(data)); | 953 | i2c_master_recv(client, data, sizeof(data)); |
966 | h->chip = V4L2_IDENT_SAA6752HS; | ||
967 | h->revision = (data[8] << 8) | data[9]; | 954 | h->revision = (data[8] << 8) | data[9]; |
968 | h->has_ac3 = 0; | 955 | h->has_ac3 = 0; |
969 | if (h->revision == 0x0206) { | 956 | if (h->revision == 0x0206) { |
970 | h->chip = V4L2_IDENT_SAA6752HS_AC3; | ||
971 | h->has_ac3 = 1; | 957 | h->has_ac3 = 1; |
972 | v4l_info(client, "support AC-3\n"); | 958 | v4l_info(client, "support AC-3\n"); |
973 | } | 959 | } |