aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2009-08-29 16:36:50 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-18 23:19:22 -0400
commit0da2808ca27ab7f65346d4d191569c669db8f628 (patch)
tree65047aeb01bc24607dd2b58aea6601f8515a1111 /drivers/media
parent96c75399544838e1752001c8abdde36dd459cf8f (diff)
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>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/soc_camera.c1
-rw-r--r--drivers/media/video/soc_camera_platform.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c
index e8248ba0c03c..59aa7a3694c2 100644
--- 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,
856 goto ei2cnd; 856 goto ei2cnd;
857 } 857 }
858 858
859 subdev->grp_id = (__u32)icd;
860 client = subdev->priv; 859 client = subdev->priv;
861 860
862 /* Use to_i2c_client(dev) to recover the i2c client */ 861 /* 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 1b6dd02a801f..b6a575ce5da2 100644
--- 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)
137 137
138 v4l2_subdev_init(&priv->subdev, &platform_subdev_ops); 138 v4l2_subdev_init(&priv->subdev, &platform_subdev_ops);
139 v4l2_set_subdevdata(&priv->subdev, p); 139 v4l2_set_subdevdata(&priv->subdev, p);
140 priv->subdev.grp_id = (__u32)icd;
141 strncpy(priv->subdev.name, dev_name(&pdev->dev), V4L2_SUBDEV_NAME_SIZE); 140 strncpy(priv->subdev.name, dev_name(&pdev->dev), V4L2_SUBDEV_NAME_SIZE);
142 141
143 ret = v4l2_device_register_subdev(&ici->v4l2_dev, &priv->subdev); 142 ret = v4l2_device_register_subdev(&ici->v4l2_dev, &priv->subdev);