From patchwork Mon Jun 20 19:09:55 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ondrej Zary X-Patchwork-Id: 898132 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p5KJAoTt012696 for ; Mon, 20 Jun 2011 19:10:51 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755545Ab1FTTKH (ORCPT ); Mon, 20 Jun 2011 15:10:07 -0400 Received: from mail1-out1.atlantis.sk ([80.94.52.55]:35729 "EHLO mail.atlantis.sk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755577Ab1FTTKF (ORCPT ); Mon, 20 Jun 2011 15:10:05 -0400 Received: (qmail 16495 invoked from network); 20 Jun 2011 19:10:05 -0000 Received: from unknown (HELO pentium) (rainbow@rainbow-software.org@89.173.145.150) by mail.atlantis.sk with AES256-SHA encrypted SMTP; 20 Jun 2011 19:10:05 -0000 To: Hans Verkuil Subject: [PATCH] [resend] tea575x: remove useless input ioctls Cc: linux-media@vger.kernel.org, alsa-devel@alsa-project.org, Kernel development list Content-Disposition: inline From: Ondrej Zary Date: Mon, 20 Jun 2011 21:09:55 +0200 MIME-Version: 1.0 Message-Id: <201106202109.58370.linux@rainbow-software.org> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 20 Jun 2011 19:11:53 +0000 (UTC) Remove empty and useless g_input and s_input ioctls. This fixes one fail of v4l2-compliance test. Signed-off-by: Ondrej Zary --- linux-2.6.39-rc2-/sound/i2c/other/tea575x-tuner.c 2011-06-11 15:29:18.000000000 +0200 +++ linux-2.6.39-rc2/sound/i2c/other/tea575x-tuner.c 2011-06-11 15:29:51.000000000 +0200 @@ -269,19 +269,6 @@ static int tea575x_s_ctrl(struct v4l2_ct return -EINVAL; } -static int vidioc_g_input(struct file *filp, void *priv, unsigned int *i) -{ - *i = 0; - return 0; -} - -static int vidioc_s_input(struct file *filp, void *priv, unsigned int i) -{ - if (i != 0) - return -EINVAL; - return 0; -} - static const struct v4l2_file_operations tea575x_fops = { .owner = THIS_MODULE, .unlocked_ioctl = video_ioctl2, @@ -293,8 +280,6 @@ static const struct v4l2_ioctl_ops tea57 .vidioc_s_tuner = vidioc_s_tuner, .vidioc_g_audio = vidioc_g_audio, .vidioc_s_audio = vidioc_s_audio, - .vidioc_g_input = vidioc_g_input, - .vidioc_s_input = vidioc_s_input, .vidioc_g_frequency = vidioc_g_frequency, .vidioc_s_frequency = vidioc_s_frequency, };