1 files changed, 2 insertions, 17 deletions

diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c
index 3f0871b550ad..810eef43c216 100644
--- a/drivers/media/video/v4l2-common.c
+++ b/drivers/media/video/v4l2-common.c
@@ -407,18 +407,6 @@ struct v4l2_subdev *v4l2_i2c_new_subdev_board(struct v4l2_device *v4l2_dev,
         /* Decrease the module use count to match the first try_module_get. */
         module_put(client->driver->driver.owner);
 
-        if (sd) {
-                /* We return errors from v4l2_subdev_call only if we have the
-                   callback as the .s_config is not mandatory */
-                int err = v4l2_subdev_call(sd, core, s_config,
-                                info->irq, info->platform_data);
-
-                if (err && err != -ENOIOCTLCMD) {
-                        v4l2_device_unregister_subdev(sd);
-                        sd = NULL;
-                }
-        }
-
 error:
         /* If we have a client but no subdev, then something went wrong and
            we must unregister the client. */
@@ -428,9 +416,8 @@ error:
 }
 EXPORT_SYMBOL_GPL(v4l2_i2c_new_subdev_board);
 
-struct v4l2_subdev *v4l2_i2c_new_subdev_cfg(struct v4l2_device *v4l2_dev,
+struct v4l2_subdev *v4l2_i2c_new_subdev(struct v4l2_device *v4l2_dev,
                 struct i2c_adapter *adapter, const char *client_type,
-                int irq, void *platform_data,
                 u8 addr, const unsigned short *probe_addrs)
 {
         struct i2c_board_info info;
@@ -440,12 +427,10 @@ struct v4l2_subdev *v4l2_i2c_new_subdev_cfg(struct v4l2_device *v4l2_dev,
         memset(&info, 0, sizeof(info));
         strlcpy(info.type, client_type, sizeof(info.type));
         info.addr = addr;
-        info.irq = irq;
-        info.platform_data = platform_data;
 
         return v4l2_i2c_new_subdev_board(v4l2_dev, adapter, &info, probe_addrs);
 }
-EXPORT_SYMBOL_GPL(v4l2_i2c_new_subdev_cfg);
+EXPORT_SYMBOL_GPL(v4l2_i2c_new_subdev);
 
 /* Return i2c client address of v4l2_subdev. */
 unsigned short v4l2_i2c_subdev_addr(struct v4l2_subdev *sd)