Merge branch 'topic/workq-update' into topic/misc

3 files changed, 1 insertions, 3 deletions

diff --git a/drivers/media/video/davinci/vpfe_capture.c b/drivers/media/video/davinci/vpfe_capture.c
index d8e38cc4ec40..7333a9bb2549 100644
--- a/drivers/media/video/davinci/vpfe_capture.c
+++ b/drivers/media/video/davinci/vpfe_capture.c
@@ -1986,7 +1986,6 @@ static __init int vpfe_probe(struct platform_device *pdev)
                 vpfe_dev->sd[i] =
                         v4l2_i2c_new_subdev_board(&vpfe_dev->v4l2_dev,
                                                   i2c_adap,
-                                                  NULL,
                                                   &sdinfo->board_info,
                                                   NULL);
                 if (vpfe_dev->sd[i]) {
diff --git a/drivers/media/video/davinci/vpif_capture.c b/drivers/media/video/davinci/vpif_capture.c
index 6ac6acd16352..193abab6b355 100644
--- a/drivers/media/video/davinci/vpif_capture.c
+++ b/drivers/media/video/davinci/vpif_capture.c
@@ -2013,7 +2013,6 @@ static __init int vpif_probe(struct platform_device *pdev)
                 vpif_obj.sd[i] =
                         v4l2_i2c_new_subdev_board(&vpif_obj.v4l2_dev,
                                                   i2c_adap,
-                                                  NULL,
                                                   &subdevdata->board_info,
                                                   NULL);
 
diff --git a/drivers/media/video/davinci/vpif_display.c b/drivers/media/video/davinci/vpif_display.c
index 685f6a6ee603..412c65d54fe1 100644
--- a/drivers/media/video/davinci/vpif_display.c
+++ b/drivers/media/video/davinci/vpif_display.c
@@ -1553,7 +1553,7 @@ static __init int vpif_probe(struct platform_device *pdev)
 
         for (i = 0; i < subdev_count; i++) {
                 vpif_obj.sd[i] = v4l2_i2c_new_subdev_board(&vpif_obj.v4l2_dev,
-                                                i2c_adap, NULL,
+                                                i2c_adap,
                                                 &subdevdata[i].board_info,
                                                 NULL);
                 if (!vpif_obj.sd[i]) {