Skip to contentSkip to conversation

v4l2: remove unnecessary vidioc_s_std() from gspca

PATCH Superseded Németh Márton 1 participant 2 messages Jul 7, 2009 – Aug 23, 2009 Media (V4L/DVB)

lore
Share & tools
lore

Németh Márton

author
#0 lore raw

PATCH 2/2 v4l2: remove unnecessary vidioc_s_std() from gspca

From: Márton Németh <[email protected]>

The vidioc_s_std() is not necessary when vdev->tvnorms == 0. [1]

The changeset was tested together with v4l-test 0.16 [2] with gspca_sunplus driver together with Trust 610 LCD POWERC@M ZOOM.

References:
[1] V4L2 API specification, revision 0.24

    http://v4l2spec.bytesex.org/spec/x448.htm

[2] v4l-test: Test environment for Video For Linux Two API
http://v4l-test.sourceforge.net/

Signed-off-by Márton Németh <[email protected]>

---

drivers/media/video/gspca/gspca.c renamed from drivers/media/video/gspca/gspca.c.orig +0 -7
@@ -1405,12 +1405,6 @@ static int vidioc_s_parm(struct file *fi
 	return 0;
 }
 
-static int vidioc_s_std(struct file *filp, void *priv,
-			v4l2_std_id *parm)
-{
-	return 0;
-}
-
 #ifdef CONFIG_VIDEO_V4L1_COMPAT
 static int vidiocgmbuf(struct file *file, void *priv,
 			struct video_mbuf *mbuf)

@@ -1881,7 +1875,6 @@ static const struct v4l2_ioctl_ops dev_i
 	.vidioc_s_jpegcomp	= vidioc_s_jpegcomp,
 	.vidioc_g_parm		= vidioc_g_parm,
 	.vidioc_s_parm		= vidioc_s_parm,
-	.vidioc_s_std		= vidioc_s_std,
 	.vidioc_enum_framesizes = vidioc_enum_framesizes,
 #ifdef CONFIG_VIDEO_V4L1_COMPAT
 	.vidiocgmbuf          = vidiocgmbuf,
author
#1 lore raw

PATCH RESEND 2/2 v4l2: remove unnecessary vidioc_s_std() from gspca

From: Márton Németh <[email protected]>

The vidioc_s_std() is not necessary when vdev->tvnorms == 0. [1]

The changeset was tested together with v4l-test 0.19 [2] with gspca_sunplus driver together with Trust 610 LCD POWERC@M ZOOM and with gspca_pac7311 together with Labtec Webcam 2200.

References:
[1] V4L2 API specification, revision 0.24

    http://v4l2spec.bytesex.org/spec/x448.htm

[2] v4l-test: Test environment for Video For Linux Two API
http://v4l-test.sourceforge.net/

Signed-off-by Márton Németh <[email protected]>

---

drivers/media/video/gspca/gspca.c +0 -7
@@ -1473,12 +1473,6 @@ static int vidioc_s_parm(struct file *fi
 	return 0;
 }
 
-static int vidioc_s_std(struct file *filp, void *priv,
-			v4l2_std_id *parm)
-{
-	return 0;
-}
-
 #ifdef CONFIG_VIDEO_V4L1_COMPAT
 static int vidiocgmbuf(struct file *file, void *priv,
 			struct video_mbuf *mbuf)

@@ -1949,7 +1943,6 @@ static const struct v4l2_ioctl_ops dev_i
 	.vidioc_s_jpegcomp	= vidioc_s_jpegcomp,
 	.vidioc_g_parm		= vidioc_g_parm,
 	.vidioc_s_parm		= vidioc_s_parm,
-	.vidioc_s_std		= vidioc_s_std,
 	.vidioc_enum_framesizes = vidioc_enum_framesizes,
 #ifdef CONFIG_VIDEO_ADV_DEBUG
 	.vidioc_g_register	= vidioc_g_register,