summaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/saa7146
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2013-05-29 06:59:35 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-06-17 08:36:35 -0300
commitabca2056dc3dd0d813ba2f8b013e98cf009ba168 (patch)
tree6da342f2892b662291d686e45d83269e4c8921d5 /drivers/media/pci/saa7146
parent191b79b0883cb0e604ba63fb3f85cf50ecfc9dc3 (diff)
downloadlinux-stable-abca2056dc3dd0d813ba2f8b013e98cf009ba168.tar.gz
linux-stable-abca2056dc3dd0d813ba2f8b013e98cf009ba168.tar.bz2
linux-stable-abca2056dc3dd0d813ba2f8b013e98cf009ba168.zip
[media] v4l2: remove g_chip_ident from bridge drivers where it is easy to do so
VIDIOC_DBG_G_CHIP_IDENT has been replaced by VIDIOC_DBG_G_CHIP_INFO. Remove g_chip_ident support from bridge drivers since it is no longer needed. This patch takes care of all the trivial cases. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Acked-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> Acked-by: Scott Jiang <scott.jiang.linux@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/pci/saa7146')
-rw-r--r--drivers/media/pci/saa7146/mxb.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/media/pci/saa7146/mxb.c b/drivers/media/pci/saa7146/mxb.c
index 52cbe7a027cc..8d177691cd7c 100644
--- a/drivers/media/pci/saa7146/mxb.c
+++ b/drivers/media/pci/saa7146/mxb.c
@@ -669,12 +669,8 @@ static int vidioc_g_register(struct file *file, void *fh, struct v4l2_dbg_regist
{
struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev;
- if (v4l2_chip_match_host(&reg->match)) {
- reg->val = saa7146_read(dev, reg->reg);
- reg->size = 4;
- return 0;
- }
- call_all(dev, core, g_register, reg);
+ reg->val = saa7146_read(dev, reg->reg);
+ reg->size = 4;
return 0;
}
@@ -682,11 +678,8 @@ static int vidioc_s_register(struct file *file, void *fh, const struct v4l2_dbg_
{
struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev;
- if (v4l2_chip_match_host(&reg->match)) {
- saa7146_write(dev, reg->reg, reg->val);
- return 0;
- }
- return call_all(dev, core, s_register, reg);
+ saa7146_write(dev, reg->reg, reg->val);
+ return 0;
}
#endif