From patchwork Tue Jul 7 06:18:09 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: 1304 Return-path: Envelope-to: mchehab@infradead.org Delivery-date: Tue, 07 Jul 2009 06:21:23 +0000 Received: from bombadil.infradead.org [18.85.46.34] by pedra.chehab.org with IMAP (fetchmail-6.3.6) for (single-drop); Tue, 07 Jul 2009 03:48:04 -0300 (BRT) Received: from vger.kernel.org ([209.132.176.167]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1MO43O-0008BG-SU; Tue, 07 Jul 2009 06:21:23 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754447AbZGGGVR (ORCPT + 1 other); Tue, 7 Jul 2009 02:21:17 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754264AbZGGGVQ (ORCPT ); Tue, 7 Jul 2009 02:21:16 -0400 Received: from mail01a.mail.t-online.hu ([84.2.40.6]:63047 "EHLO mail01a.mail.t-online.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755323AbZGGGVP (ORCPT ); Tue, 7 Jul 2009 02:21:15 -0400 Received: from [192.168.1.68] (dsl51B65998.pool.t-online.hu [81.182.89.152]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail01a.mail.t-online.hu (Postfix) with ESMTPSA id 2DFD17981F9; Tue, 7 Jul 2009 08:18:38 +0200 (CEST) Message-ID: <4A52E8A1.40408@freemail.hu> Date: Tue, 07 Jul 2009 08:18:09 +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 , linux-media@vger.kernel.org CC: LKML Subject: [PATCH 2/2] v4l2: remove unnecessary vidioc_s_std() from gspca X-DCC-mail.t-online.hu-Metrics: mail01a.mail.t-online.hu 32710; Body=4 Fuz1=4 Fuz2=4 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.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 --- -- 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-rc1/drivers/media/video/gspca/gspca.c.orig 2009-06-25 01:25:37.000000000 +0200 +++ linux-2.6.31-rc1/drivers/media/video/gspca/gspca.c 2009-07-06 08:14:19.000000000 +0200 @@ -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,