From patchwork Mon Jun 6 17:16:49 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 852832 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p56HGq23014098 for ; Mon, 6 Jun 2011 17:16:53 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756082Ab1FFRQv (ORCPT ); Mon, 6 Jun 2011 13:16:51 -0400 Received: from moutng.kundenserver.de ([212.227.126.171]:64628 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753601Ab1FFRQv (ORCPT ); Mon, 6 Jun 2011 13:16:51 -0400 Received: from axis700.grange (dslb-178-006-245-001.pools.arcor-ip.net [178.6.245.1]) by mrelayeu.kundenserver.de (node=mrbap4) with ESMTP (Nemesis) id 0MN4u0-1QVqLh1jtQ-006ftO; Mon, 06 Jun 2011 19:16:49 +0200 Received: by axis700.grange (Postfix, from userid 1000) id 107EB189B78; Mon, 6 Jun 2011 19:16:49 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by axis700.grange (Postfix) with ESMTP id 0C4C5189B77; Mon, 6 Jun 2011 19:16:49 +0200 (CEST) Date: Mon, 6 Jun 2011 19:16:49 +0200 (CEST) From: Guennadi Liakhovetski X-X-Sender: lyakh@axis700.grange To: Linux Media Mailing List cc: Kuninori Morimoto Subject: [PATCH] V4L: tw9910: remove bogus ENUMINPUT implementation Message-ID: MIME-Version: 1.0 X-Provags-ID: V02:K0:x+ZYU20AwARWYQ9HW7bctlPWMs0vx/VBKKkjLZfA7F6 AFibb1uF60wwJ78ictukgNjoI95N6OF7fEANotWRfb/rT4TyXg lQCCFFPIqhVIeWS1kV7gQ/MlsgteT3EK+FQxUwIhMFzZcNkWGR T6bNO3JxeDyOZYO07+i06aQZB2mjMKDdNqRt7/8Uqsg9IOZNvi EE/vKdst55jnWmWYx/K/SriLZEZAE7oZWHMEab10/I= 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 (demeter2.kernel.org [140.211.167.43]); Mon, 06 Jun 2011 17:16:53 +0000 (UTC) tw9910 is a TV decoder, it doesn't have a tuner. Besides, the .enum_input soc-camera operation is optional and normally not needed. Signed-off-by: Guennadi Liakhovetski --- drivers/media/video/tw9910.c | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/drivers/media/video/tw9910.c b/drivers/media/video/tw9910.c index 0347bbe..a722f66 100644 --- a/drivers/media/video/tw9910.c +++ b/drivers/media/video/tw9910.c @@ -552,16 +552,6 @@ static int tw9910_s_std(struct v4l2_subdev *sd, v4l2_std_id norm) return ret; } -static int tw9910_enum_input(struct soc_camera_device *icd, - struct v4l2_input *inp) -{ - inp->type = V4L2_INPUT_TYPE_TUNER; - inp->std = V4L2_STD_UNKNOWN; - strcpy(inp->name, "Video"); - - return 0; -} - static int tw9910_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident *id) { @@ -891,7 +881,6 @@ static int tw9910_video_probe(struct soc_camera_device *icd, static struct soc_camera_ops tw9910_ops = { .set_bus_param = tw9910_set_bus_param, .query_bus_param = tw9910_query_bus_param, - .enum_input = tw9910_enum_input, }; static struct v4l2_subdev_core_ops tw9910_subdev_core_ops = {