aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-05-29 05:59:48 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-06-17 07:49:32 -0400
commit5f7105755ffe17840a209c556a6f56f31122304b (patch)
tree62c2db701ea7640eb6e1be43696bc28972575669 /drivers
parent4b7be2bbe0fa8a0e70a61506dcdf088e3b8a8917 (diff)
[media] radio: remove g_chip_ident op
This is no longer needed since the core now handles this through DBG_G_CHIP_INFO. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/radio/saa7706h.c10
-rw-r--r--drivers/media/radio/tef6862.c14
2 files changed, 0 insertions, 24 deletions
diff --git a/drivers/media/radio/saa7706h.c b/drivers/media/radio/saa7706h.c
index 06c06cc9ff25..d1f30d6762d3 100644
--- a/drivers/media/radio/saa7706h.c
+++ b/drivers/media/radio/saa7706h.c
@@ -25,7 +25,6 @@
25#include <linux/i2c.h> 25#include <linux/i2c.h>
26#include <linux/slab.h> 26#include <linux/slab.h>
27#include <media/v4l2-device.h> 27#include <media/v4l2-device.h>
28#include <media/v4l2-chip-ident.h>
29 28
30#define DRIVER_NAME "saa7706h" 29#define DRIVER_NAME "saa7706h"
31 30
@@ -349,16 +348,7 @@ static int saa7706h_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
349 return -EINVAL; 348 return -EINVAL;
350} 349}
351 350
352static int saa7706h_g_chip_ident(struct v4l2_subdev *sd,
353 struct v4l2_dbg_chip_ident *chip)
354{
355 struct i2c_client *client = v4l2_get_subdevdata(sd);
356
357 return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_SAA7706H, 0);
358}
359
360static const struct v4l2_subdev_core_ops saa7706h_core_ops = { 351static const struct v4l2_subdev_core_ops saa7706h_core_ops = {
361 .g_chip_ident = saa7706h_g_chip_ident,
362 .queryctrl = saa7706h_queryctrl, 352 .queryctrl = saa7706h_queryctrl,
363 .g_ctrl = saa7706h_g_ctrl, 353 .g_ctrl = saa7706h_g_ctrl,
364 .s_ctrl = saa7706h_s_ctrl, 354 .s_ctrl = saa7706h_s_ctrl,
diff --git a/drivers/media/radio/tef6862.c b/drivers/media/radio/tef6862.c
index 82c6c9475d7c..d78afbb08569 100644
--- a/drivers/media/radio/tef6862.c
+++ b/drivers/media/radio/tef6862.c
@@ -25,7 +25,6 @@
25#include <linux/slab.h> 25#include <linux/slab.h>
26#include <media/v4l2-ioctl.h> 26#include <media/v4l2-ioctl.h>
27#include <media/v4l2-device.h> 27#include <media/v4l2-device.h>
28#include <media/v4l2-chip-ident.h>
29 28
30#define DRIVER_NAME "tef6862" 29#define DRIVER_NAME "tef6862"
31 30
@@ -136,14 +135,6 @@ static int tef6862_g_frequency(struct v4l2_subdev *sd, struct v4l2_frequency *f)
136 return 0; 135 return 0;
137} 136}
138 137
139static int tef6862_g_chip_ident(struct v4l2_subdev *sd,
140 struct v4l2_dbg_chip_ident *chip)
141{
142 struct i2c_client *client = v4l2_get_subdevdata(sd);
143
144 return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_TEF6862, 0);
145}
146
147static const struct v4l2_subdev_tuner_ops tef6862_tuner_ops = { 138static const struct v4l2_subdev_tuner_ops tef6862_tuner_ops = {
148 .g_tuner = tef6862_g_tuner, 139 .g_tuner = tef6862_g_tuner,
149 .s_tuner = tef6862_s_tuner, 140 .s_tuner = tef6862_s_tuner,
@@ -151,12 +142,7 @@ static const struct v4l2_subdev_tuner_ops tef6862_tuner_ops = {
151 .g_frequency = tef6862_g_frequency, 142 .g_frequency = tef6862_g_frequency,
152}; 143};
153 144
154static const struct v4l2_subdev_core_ops tef6862_core_ops = {
155 .g_chip_ident = tef6862_g_chip_ident,
156};
157
158static const struct v4l2_subdev_ops tef6862_ops = { 145static const struct v4l2_subdev_ops tef6862_ops = {
159 .core = &tef6862_core_ops,
160 .tuner = &tef6862_tuner_ops, 146 .tuner = &tef6862_tuner_ops,
161}; 147};
162 148