On Fri June 7 2013 11:36:57 Guennadi Liakhovetski wrote: > Hi Hans > > On Mon, 3 Jun 2013, Hans Verkuil wrote: > > > From: Hans Verkuil <hans.verkuil@xxxxxxxxx> > > > > 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@xxxxxxxxx> > > Cc: Guennadi Liakhovetski <g.liakhovetski@xxxxxx> > > I'd rather take this via my tree to avoid any conflicts, is this ok with > you? Ideally I would like to take this in myself since the last patch of the series removes current_norm support entirely. If you take it, then I have to leave off the last patch until both our trees are merged. If you still prefer to take it yourself, then let me know and I'll leave this patch and the last patch out when I merge it. Regards, Hans > > Thanks > Guennadi > > > --- > > drivers/media/platform/soc_camera/soc_camera.c | 3 --- > > 1 file changed, 3 deletions(-) > > > > diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c > > index eea832c..96645e9 100644 > > --- a/drivers/media/platform/soc_camera/soc_camera.c > > +++ b/drivers/media/platform/soc_camera/soc_camera.c > > @@ -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; > > @@ -1513,11 +1512,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; > > > > --- > Guennadi Liakhovetski, Ph.D. > Freelance Open-Source Software Developer > http://www.open-technology.de/ > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
