[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>

3 files changed, 6 insertions, 140 deletions

diff --git a/drivers/media/usb/au0828/au0828-video.c b/drivers/media/usb/au0828/au0828-video.c
index 75ac9947cdac..4944a365570a 100644
--- a/drivers/media/usb/au0828/au0828-video.c
+++ b/drivers/media/usb/au0828/au0828-video.c
@@ -36,7 +36,6 @@
 #include <media/v4l2-common.h>
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-event.h>
-#include <media/v4l2-chip-ident.h>
 #include <media/tuner.h>
 #include "au0828.h"
 #include "au0828-reg.h"
@@ -1638,26 +1637,6 @@ static int vidioc_g_fmt_vbi_cap(struct file *file, void *priv,
         return 0;
 }
 
-static int vidioc_g_chip_ident(struct file *file, void *priv,
-               struct v4l2_dbg_chip_ident *chip)
-{
-        struct au0828_fh *fh = priv;
-        struct au0828_dev *dev = fh->dev;
-        chip->ident = V4L2_IDENT_NONE;
-        chip->revision = 0;
-
-        if (v4l2_chip_match_host(&chip->match)) {
-                chip->ident = V4L2_IDENT_AU0828;
-                return 0;
-        }
-
-        v4l2_device_call_all(&dev->v4l2_dev, 0, core, g_chip_ident, chip);
-        if (chip->ident == V4L2_IDENT_NONE)
-                return -EINVAL;
-
-        return 0;
-}
-
 static int vidioc_cropcap(struct file *file, void *priv,
                           struct v4l2_cropcap *cc)
 {
@@ -1779,15 +1758,6 @@ static int vidioc_g_register(struct file *file, void *priv,
         struct au0828_fh *fh = priv;
         struct au0828_dev *dev = fh->dev;
 
-        switch (reg->match.type) {
-        case V4L2_CHIP_MATCH_I2C_DRIVER:
-                v4l2_device_call_all(&dev->v4l2_dev, 0, core, g_register, reg);
-                return 0;
-        default:
-                if (!v4l2_chip_match_host(&reg->match))
-                        return -EINVAL;
-        }
-
         reg->val = au0828_read(dev, reg->reg);
         return 0;
 }
@@ -1798,14 +1768,6 @@ static int vidioc_s_register(struct file *file, void *priv,
         struct au0828_fh *fh = priv;
         struct au0828_dev *dev = fh->dev;
 
-        switch (reg->match.type) {
-        case V4L2_CHIP_MATCH_I2C_DRIVER:
-                v4l2_device_call_all(&dev->v4l2_dev, 0, core, s_register, reg);
-                return 0;
-        default:
-                if (!v4l2_chip_match_host(&reg->match))
-                        return -EINVAL;
-        }
         return au0828_writereg(dev, reg->reg, reg->val);
 }
 #endif
@@ -1943,7 +1905,6 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {
         .vidioc_g_register          = vidioc_g_register,
         .vidioc_s_register          = vidioc_s_register,
 #endif
-        .vidioc_g_chip_ident        = vidioc_g_chip_ident,
         .vidioc_log_status          = vidioc_log_status,
         .vidioc_subscribe_event     = v4l2_ctrl_subscribe_event,
         .vidioc_unsubscribe_event   = v4l2_event_unsubscribe,
diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
index 32d60e5546bc..1a577ed8ea0c 100644
--- a/drivers/media/usb/em28xx/em28xx-video.c
+++ b/drivers/media/usb/em28xx/em28xx-video.c
@@ -41,7 +41,6 @@
 #include <media/v4l2-common.h>
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-event.h>
-#include <media/v4l2-chip-ident.h>
 #include <media/msp3400.h>
 #include <media/tuner.h>
 
@@ -1309,28 +1308,6 @@ static int vidioc_s_frequency(struct file *file, void *priv,
         return 0;
 }
 
-static int vidioc_g_chip_ident(struct file *file, void *priv,
-               struct v4l2_dbg_chip_ident *chip)
-{
-        struct em28xx_fh      *fh  = priv;
-        struct em28xx         *dev = fh->dev;
-
-        chip->ident = V4L2_IDENT_NONE;
-        chip->revision = 0;
-        if (chip->match.type == V4L2_CHIP_MATCH_BRIDGE) {
-                if (chip->match.addr > 1)
-                        return -EINVAL;
-                return 0;
-        }
-        if (chip->match.type != V4L2_CHIP_MATCH_I2C_DRIVER &&
-            chip->match.type != V4L2_CHIP_MATCH_I2C_ADDR)
-                return -EINVAL;
-
-        v4l2_device_call_all(&dev->v4l2_dev, 0, core, g_chip_ident, chip);
-
-        return 0;
-}
-
 #ifdef CONFIG_VIDEO_ADV_DEBUG
 static int vidioc_g_chip_info(struct file *file, void *priv,
                struct v4l2_dbg_chip_info *chip)
@@ -1366,14 +1343,9 @@ static int vidioc_g_register(struct file *file, void *priv,
         struct em28xx         *dev = fh->dev;
         int ret;
 
-        switch (reg->match.type) {
-        case V4L2_CHIP_MATCH_BRIDGE:
-                if (reg->match.addr > 1)
-                        return -EINVAL;
-                if (!reg->match.addr)
-                        break;
-                /* fall-through */
-        case V4L2_CHIP_MATCH_AC97:
+        if (reg->match.addr > 1)
+                return -EINVAL;
+        if (reg->match.addr) {
                 ret = em28xx_read_ac97(dev, reg->reg);
                 if (ret < 0)
                         return ret;
@@ -1381,15 +1353,6 @@ static int vidioc_g_register(struct file *file, void *priv,
                 reg->val = ret;
                 reg->size = 1;
                 return 0;
-        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:
-                return -EINVAL;
         }
 
         /* Match host */
@@ -1421,25 +1384,10 @@ static int vidioc_s_register(struct file *file, void *priv,
         struct em28xx         *dev = fh->dev;
         __le16 buf;
 
-        switch (reg->match.type) {
-        case V4L2_CHIP_MATCH_BRIDGE:
-                if (reg->match.addr > 1)
-                        return -EINVAL;
-                if (!reg->match.addr)
-                        break;
-                /* fall-through */
-        case V4L2_CHIP_MATCH_AC97:
-                return em28xx_write_ac97(dev, reg->reg, reg->val);
-        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 (reg->match.addr > 1)
                 return -EINVAL;
-        }
+        if (reg->match.addr)
+                return em28xx_write_ac97(dev, reg->reg, reg->val);
 
         /* Match host */
         buf = cpu_to_le16(reg->val);
@@ -1795,7 +1743,6 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {
         .vidioc_s_frequency         = vidioc_s_frequency,
         .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_chip_info         = vidioc_g_chip_info,
         .vidioc_g_register          = vidioc_g_register,
@@ -1826,7 +1773,6 @@ static const struct v4l2_ioctl_ops radio_ioctl_ops = {
         .vidioc_s_frequency   = vidioc_s_frequency,
         .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_chip_info   = vidioc_g_chip_info,
         .vidioc_g_register    = vidioc_g_register,
diff --git a/drivers/media/usb/stk1160/stk1160-v4l.c b/drivers/media/usb/stk1160/stk1160-v4l.c
index a59153d2f8bf..876fc26565e3 100644
--- a/drivers/media/usb/stk1160/stk1160-v4l.c
+++ b/drivers/media/usb/stk1160/stk1160-v4l.c
@@ -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(&reg->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(&reg->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,