1 files changed, 2 insertions, 29 deletions

diff --git a/drivers/media/i2c/soc_camera/rj54n1cb0c.c b/drivers/media/i2c/soc_camera/rj54n1cb0c.c
index 1f9ec3b06b4e..81b515c2fb36 100644
--- a/drivers/media/i2c/soc_camera/rj54n1cb0c.c
+++ b/drivers/media/i2c/soc_camera/rj54n1cb0c.c
@@ -18,7 +18,6 @@
 #include <media/rj54n1cb0c.h>
 #include <media/soc_camera.h>
 #include <media/v4l2-subdev.h>
-#include <media/v4l2-chip-ident.h>
 #include <media/v4l2-ctrls.h>
 
 #define RJ54N1_DEV_CODE                 0x0400
@@ -1120,37 +1119,16 @@ static int rj54n1_s_fmt(struct v4l2_subdev *sd,
         return 0;
 }
 
-static int rj54n1_g_chip_ident(struct v4l2_subdev *sd,
-                               struct v4l2_dbg_chip_ident *id)
-{
-        struct i2c_client *client = v4l2_get_subdevdata(sd);
-
-        if (id->match.type != V4L2_CHIP_MATCH_I2C_ADDR)
-                return -EINVAL;
-
-        if (id->match.addr != client->addr)
-                return -ENODEV;
-
-        id->ident       = V4L2_IDENT_RJ54N1CB0C;
-        id->revision    = 0;
-
-        return 0;
-}
-
 #ifdef CONFIG_VIDEO_ADV_DEBUG
 static int rj54n1_g_register(struct v4l2_subdev *sd,
                              struct v4l2_dbg_register *reg)
 {
         struct i2c_client *client = v4l2_get_subdevdata(sd);
 
-        if (reg->match.type != V4L2_CHIP_MATCH_I2C_ADDR ||
-            reg->reg < 0x400 || reg->reg > 0x1fff)
+        if (reg->reg < 0x400 || reg->reg > 0x1fff)
                 /* Registers > 0x0800 are only available from Sharp support */
                 return -EINVAL;
 
-        if (reg->match.addr != client->addr)
-                return -ENODEV;
-
         reg->size = 1;
         reg->val = reg_read(client, reg->reg);
 
@@ -1165,14 +1143,10 @@ static int rj54n1_s_register(struct v4l2_subdev *sd,
 {
         struct i2c_client *client = v4l2_get_subdevdata(sd);
 
-        if (reg->match.type != V4L2_CHIP_MATCH_I2C_ADDR ||
-            reg->reg < 0x400 || reg->reg > 0x1fff)
+        if (reg->reg < 0x400 || reg->reg > 0x1fff)
                 /* Registers >= 0x0800 are only available from Sharp support */
                 return -EINVAL;
 
-        if (reg->match.addr != client->addr)
-                return -ENODEV;
-
         if (reg_write(client, reg->reg, reg->val) < 0)
                 return -EIO;
 
@@ -1233,7 +1207,6 @@ static const struct v4l2_ctrl_ops rj54n1_ctrl_ops = {
 };
 
 static struct v4l2_subdev_core_ops rj54n1_subdev_core_ops = {
-        .g_chip_ident   = rj54n1_g_chip_ident,
 #ifdef CONFIG_VIDEO_ADV_DEBUG
         .g_register     = rj54n1_g_register,
         .s_register     = rj54n1_s_register,