From patchwork Fri Jan 4 20:59:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Devin Heitmueller X-Patchwork-Id: 1934661 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 6C82C3FF0F for ; Fri, 4 Jan 2013 20:59:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754936Ab3ADU74 (ORCPT ); Fri, 4 Jan 2013 15:59:56 -0500 Received: from mail-vc0-f176.google.com ([209.85.220.176]:57889 "EHLO mail-vc0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754647Ab3ADU7z (ORCPT ); Fri, 4 Jan 2013 15:59:55 -0500 Received: by mail-vc0-f176.google.com with SMTP id fo13so16703096vcb.7 for ; Fri, 04 Jan 2013 12:59:54 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=En1xO655UVf7TGEhEGrrnjKmKHxmbLWM/OVD9d3dzYM=; b=NRw1mW0/XOKUAFOoeDCaoKyUR0FLUZVirsMIyMHDDW0PFXo/ex0IhR7sctvSZ7lL+Q k9aXHXP5zPRuefuXGYCbrE5ZDLCwXTLU8/ZdActQ0+zVWomDor4sgN1Q2Yp/0Dej+Ogi Q3gfTtXVpbKAKD1ZfDjFLaxHbz9DHY0HSbz5TGEbwM8oL3MeGNv1rt2kd8a6Jy1MN49J gZQvhB8blDn8cRBHdfJKKlI7Fk0KZ/Nwt7T63/RNZJfJdWL19tp/G/V8tsOy+gkvltN/ nS2aIhyfHu+eP37NxJ2u9coe9yyvsQ876mKTAScaz/6c43friDtFZRIXMVOq9UZ5m8KM U22w== X-Received: by 10.220.153.80 with SMTP id j16mr76257023vcw.21.1357333194289; Fri, 04 Jan 2013 12:59:54 -0800 (PST) Received: from devin-ubuntu2.home (pool-108-54-72-165.nycmny.fios.verizon.net. [108.54.72.165]) by mx.google.com with ESMTPS id z20sm47278440vds.12.2013.01.04.12.59.53 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 04 Jan 2013 12:59:53 -0800 (PST) From: Devin Heitmueller To: linux-media@vger.kernel.org Cc: Devin Heitmueller , Hans Verkuil Subject: [PATCH 02/15] em28xx: remove bogus input/audio ioctls for the radio device. Date: Fri, 4 Jan 2013 15:59:32 -0500 Message-Id: <1357333186-8466-3-git-send-email-dheitmueller@kernellabs.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1357333186-8466-1-git-send-email-dheitmueller@kernellabs.com> References: <1357333186-8466-1-git-send-email-dheitmueller@kernellabs.com> X-Gm-Message-State: ALoCoQmObHznWMsl63Rl027rwBc/H7OnfTFsObpJ5t5SjgYHaj7DSEh/Hf1gqUlSCbsoHvyw38TW Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Radio devices should not implement those ioctls. Signed-off-by: Hans Verkuil Signed-off-by: Devin Heitmueller --- drivers/media/usb/em28xx/em28xx-video.c | 35 ------------------------------- 1 file changed, 35 deletions(-) diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c index fb9ee46..f025440 100644 --- a/drivers/media/usb/em28xx/em28xx-video.c +++ b/drivers/media/usb/em28xx/em28xx-video.c @@ -1856,26 +1856,6 @@ static int radio_g_tuner(struct file *file, void *priv, return 0; } -static int radio_enum_input(struct file *file, void *priv, - struct v4l2_input *i) -{ - if (i->index != 0) - return -EINVAL; - strcpy(i->name, "Radio"); - i->type = V4L2_INPUT_TYPE_TUNER; - - return 0; -} - -static int radio_g_audio(struct file *file, void *priv, struct v4l2_audio *a) -{ - if (unlikely(a->index)) - return -EINVAL; - - strcpy(a->name, "Radio"); - return 0; -} - static int radio_s_tuner(struct file *file, void *priv, struct v4l2_tuner *t) { @@ -1889,17 +1869,6 @@ static int radio_s_tuner(struct file *file, void *priv, return 0; } -static int radio_s_audio(struct file *file, void *fh, - const struct v4l2_audio *a) -{ - return 0; -} - -static int radio_s_input(struct file *file, void *fh, unsigned int i) -{ - return 0; -} - static int radio_queryctrl(struct file *file, void *priv, struct v4l2_queryctrl *qc) { @@ -2279,11 +2248,7 @@ static const struct v4l2_file_operations radio_fops = { static const struct v4l2_ioctl_ops radio_ioctl_ops = { .vidioc_querycap = vidioc_querycap, .vidioc_g_tuner = radio_g_tuner, - .vidioc_enum_input = radio_enum_input, - .vidioc_g_audio = radio_g_audio, .vidioc_s_tuner = radio_s_tuner, - .vidioc_s_audio = radio_s_audio, - .vidioc_s_input = radio_s_input, .vidioc_queryctrl = radio_queryctrl, .vidioc_g_ctrl = vidioc_g_ctrl, .vidioc_s_ctrl = vidioc_s_ctrl,