[media] soc_camera: remove use of current_norm
authorHans Verkuil <hans.verkuil@cisco.com>
Mon, 3 Jun 2013 08:36:41 +0000 (05:36 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 17 Jun 2013 12:34:57 +0000 (09:34 -0300)
The current_norm field is deprecated, so don't set it. Since it is set to
V4L2_STD_UNKNOWN which is 0 it didn't do anything anyway.
Also remove a few other unnecessary uses of V4L2_STD_UNKNOWN.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/platform/soc_camera/soc_camera.c

index 68efade15a7ccbed7685b900d8842bb9c3de3fba..0252fbb481549a5c57388b19d9bf11ac48b2089f 100644 (file)
@@ -235,7 +235,6 @@ static int soc_camera_enum_input(struct file *file, void *priv,
 
        /* default is camera */
        inp->type = V4L2_INPUT_TYPE_CAMERA;
-       inp->std  = V4L2_STD_UNKNOWN;
        strcpy(inp->name, "Camera");
 
        return 0;
@@ -1479,11 +1478,9 @@ static int video_dev_create(struct soc_camera_device *icd)
        strlcpy(vdev->name, ici->drv_name, sizeof(vdev->name));
 
        vdev->parent            = icd->pdev;
-       vdev->current_norm      = V4L2_STD_UNKNOWN;
        vdev->fops              = &soc_camera_fops;
        vdev->ioctl_ops         = &soc_camera_ioctl_ops;
        vdev->release           = video_device_release;
-       vdev->tvnorms           = V4L2_STD_UNKNOWN;
        vdev->ctrl_handler      = &icd->ctrl_handler;
        vdev->lock              = &ici->host_lock;