[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>
Este commit está contenido en:

cometido por
Mauro Carvalho Chehab

padre
191b79b088
commit
abca2056dc
@@ -31,7 +31,6 @@
|
||||
#include <media/v4l2-ioctl.h>
|
||||
#include <media/v4l2-fh.h>
|
||||
#include <media/v4l2-event.h>
|
||||
#include <media/v4l2-chip-ident.h>
|
||||
#include <media/videobuf2-vmalloc.h>
|
||||
|
||||
#include <media/saa7115.h>
|
||||
@@ -454,19 +453,6 @@ static int vidioc_s_input(struct file *file, void *priv, unsigned int i)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int vidioc_g_chip_ident(struct file *file, void *priv,
|
||||
struct v4l2_dbg_chip_ident *chip)
|
||||
{
|
||||
switch (chip->match.type) {
|
||||
case V4L2_CHIP_MATCH_BRIDGE:
|
||||
chip->ident = V4L2_IDENT_NONE;
|
||||
chip->revision = 0;
|
||||
return 0;
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef CONFIG_VIDEO_ADV_DEBUG
|
||||
static int vidioc_g_register(struct file *file, void *priv,
|
||||
struct v4l2_dbg_register *reg)
|
||||
@@ -475,19 +461,6 @@ static int vidioc_g_register(struct file *file, void *priv,
|
||||
int rc;
|
||||
u8 val;
|
||||
|
||||
switch (reg->match.type) {
|
||||
case V4L2_CHIP_MATCH_I2C_DRIVER:
|
||||
v4l2_device_call_all(&dev->v4l2_dev, 0, core, g_register, reg);
|
||||
return 0;
|
||||
case V4L2_CHIP_MATCH_I2C_ADDR:
|
||||
/* TODO: is this correct? */
|
||||
v4l2_device_call_all(&dev->v4l2_dev, 0, core, g_register, reg);
|
||||
return 0;
|
||||
default:
|
||||
if (!v4l2_chip_match_host(®->match))
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* Match host */
|
||||
rc = stk1160_read_reg(dev, reg->reg, &val);
|
||||
reg->val = val;
|
||||
@@ -501,19 +474,6 @@ static int vidioc_s_register(struct file *file, void *priv,
|
||||
{
|
||||
struct stk1160 *dev = video_drvdata(file);
|
||||
|
||||
switch (reg->match.type) {
|
||||
case V4L2_CHIP_MATCH_I2C_DRIVER:
|
||||
v4l2_device_call_all(&dev->v4l2_dev, 0, core, s_register, reg);
|
||||
return 0;
|
||||
case V4L2_CHIP_MATCH_I2C_ADDR:
|
||||
/* TODO: is this correct? */
|
||||
v4l2_device_call_all(&dev->v4l2_dev, 0, core, s_register, reg);
|
||||
return 0;
|
||||
default:
|
||||
if (!v4l2_chip_match_host(®->match))
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* Match host */
|
||||
return stk1160_write_reg(dev, reg->reg, cpu_to_le16(reg->val));
|
||||
}
|
||||
@@ -543,7 +503,6 @@ static const struct v4l2_ioctl_ops stk1160_ioctl_ops = {
|
||||
.vidioc_log_status = v4l2_ctrl_log_status,
|
||||
.vidioc_subscribe_event = v4l2_ctrl_subscribe_event,
|
||||
.vidioc_unsubscribe_event = v4l2_event_unsubscribe,
|
||||
.vidioc_g_chip_ident = vidioc_g_chip_ident,
|
||||
|
||||
#ifdef CONFIG_VIDEO_ADV_DEBUG
|
||||
.vidioc_g_register = vidioc_g_register,
|
||||
|
Referencia en una nueva incidencia
Block a user