1 files changed, 0 insertions, 18 deletions

diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c
index 5528cd15cc67..1d675b58fd71 100644
--- a/drivers/media/i2c/adv7604.c
+++ b/drivers/media/i2c/adv7604.c
@@ -38,7 +38,6 @@
 #include <linux/v4l2-dv-timings.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-ctrls.h>
-#include <media/v4l2-chip-ident.h>
 #include <media/adv7604.h>
 
 static int debug;
@@ -643,10 +642,6 @@ static void adv7604_inv_register(struct v4l2_subdev *sd)
 static int adv7604_g_register(struct v4l2_subdev *sd,
                                         struct v4l2_dbg_register *reg)
 {
-        struct i2c_client *client = v4l2_get_subdevdata(sd);
-
-        if (!v4l2_chip_match_i2c_client(client, &reg->match))
-                return -EINVAL;
         reg->size = 1;
         switch (reg->reg >> 8) {
         case 0:
@@ -699,10 +694,6 @@ static int adv7604_g_register(struct v4l2_subdev *sd,
 static int adv7604_s_register(struct v4l2_subdev *sd,
                                         const struct v4l2_dbg_register *reg)
 {
-        struct i2c_client *client = v4l2_get_subdevdata(sd);
-
-        if (!v4l2_chip_match_i2c_client(client, &reg->match))
-                return -EINVAL;
         switch (reg->reg >> 8) {
         case 0:
                 io_write(sd, reg->reg & 0xff, reg->val & 0xff);
@@ -980,14 +971,6 @@ static int adv7604_s_ctrl(struct v4l2_ctrl *ctrl)
         return -EINVAL;
 }
 
-static int adv7604_g_chip_ident(struct v4l2_subdev *sd,
-                                        struct v4l2_dbg_chip_ident *chip)
-{
-        struct i2c_client *client = v4l2_get_subdevdata(sd);
-
-        return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_ADV7604, 0);
-}
-
 /* ----------------------------------------------------------------------- */
 
 static inline bool no_power(struct v4l2_subdev *sd)
@@ -1783,7 +1766,6 @@ static const struct v4l2_subdev_core_ops adv7604_core_ops = {
         .s_ctrl = v4l2_subdev_s_ctrl,
         .queryctrl = v4l2_subdev_queryctrl,
         .querymenu = v4l2_subdev_querymenu,
-        .g_chip_ident = adv7604_g_chip_ident,
         .interrupt_service_routine = adv7604_isr,
 #ifdef CONFIG_VIDEO_ADV_DEBUG
         .g_register = adv7604_g_register,