From patchwork Sun Aug 23 09:30:51 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TsOpbWV0aCBNw6FydG9u?= X-Patchwork-Id: 1537 Return-path: Envelope-to: mchehab@bombadil.infradead.org Delivery-date: Sun, 23 Aug 2009 19:52:01 +0000 Received: from bombadil.infradead.org [18.85.46.34] by pedra.chehab.org with IMAP (fetchmail-6.3.6) for (single-drop); Sun, 23 Aug 2009 16:54:07 -0300 (BRT) Received: from casper.infradead.org ([85.118.1.10]) by bombadil.infradead.org with esmtps (Exim 4.69 #1 (Red Hat Linux)) id 1MfHrN-0006eI-QR for mchehab@bombadil.infradead.org; Sun, 23 Aug 2009 18:32:09 +0000 Received: from vger.kernel.org ([209.132.176.167]) by casper.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1MfA7D-0002DO-6P; Sun, 23 Aug 2009 10:15:59 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755957AbZHWJax (ORCPT + 1 other); Sun, 23 Aug 2009 05:30:53 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755956AbZHWJax (ORCPT ); Sun, 23 Aug 2009 05:30:53 -0400 Received: from mail00a.mail.t-online.hu ([84.2.40.5]:49231 "EHLO mail00a.mail.t-online.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755873AbZHWJaw (ORCPT ); Sun, 23 Aug 2009 05:30:52 -0400 Received: from [192.168.1.69] (dsl5402AB39.pool.t-online.hu [84.2.171.57]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail00a.mail.t-online.hu (Postfix) with ESMTPSA id 179762AD6D9; Sun, 23 Aug 2009 11:28:10 +0200 (CEST) Message-ID: <4A910C4B.1070600@freemail.hu> Date: Sun, 23 Aug 2009 11:30:51 +0200 From: =?UTF-8?B?TsOpbWV0aCBNw6FydG9u?= User-Agent: Mozilla/5.0 (X11; U; Linux i686; hu-HU; rv:1.8.1.21) Gecko/20090402 SeaMonkey/1.1.16 MIME-Version: 1.0 To: Mauro Carvalho Chehab , Jean-Francois Moine , Thomas Kaiser , linux-media@vger.kernel.org CC: LKML Subject: [RESEND][PATCH 2/2] v4l2: remove unnecessary vidioc_s_std() from gspca References: <4A52E8A1.40408@freemail.hu> In-Reply-To: <4A52E8A1.40408@freemail.hu> X-DCC-mail.t-online.hu-Metrics: mail00a.mail.t-online.hu 32711; Body=5 Fuz1=5 Fuz2=5 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Márton Németh 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 --- -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- linux-2.6.31-rc7.orig/drivers/media/video/gspca/gspca.c 2009-08-23 07:36:08.000000000 +0200 +++ linux-2.6.31-rc7/drivers/media/video/gspca/gspca.c 2009-08-23 11:06:22.000000000 +0200 @@ -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,