V4L/DVB (12580): soc-camera: remove now unneeded subdevice group ID assignments

Since we are not using v4l2_device_call_* calls any more, we don't need to
initialise subdevice .grp_id any more. This also fixes compiler warnings on
64-bit platforms.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c
index e8248ba..59aa7a3 100644 (file)
--- a/drivers/media/video/soc_camera.c
+++ b/drivers/media/video/soc_camera.c
@@ -856,7 +856,6 @@ static int soc_camera_init_i2c(struct soc_camera_device *icd,
                goto ei2cnd;
        }
 
-       subdev->grp_id = (__u32)icd;
        client = subdev->priv;
 
        /* Use to_i2c_client(dev) to recover the i2c client */

diff --git a/drivers/media/video/soc_camera_platform.c b/drivers/media/video/soc_camera_platform.c
index 1b6dd02..b6a575c 100644 (file)
--- a/drivers/media/video/soc_camera_platform.c
+++ b/drivers/media/video/soc_camera_platform.c
@@ -137,7 +137,6 @@ static int soc_camera_platform_probe(struct platform_device *pdev)
 
        v4l2_subdev_init(&priv->subdev, &platform_subdev_ops);
        v4l2_set_subdevdata(&priv->subdev, p);
-       priv->subdev.grp_id = (__u32)icd;
        strncpy(priv->subdev.name, dev_name(&pdev->dev), V4L2_SUBDEV_NAME_SIZE);
 
        ret = v4l2_device_register_subdev(&ici->v4l2_dev, &priv->subdev);