From patchwork Mon Jun 6 17:22:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 852872 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p56HMBwr013304 for ; Mon, 6 Jun 2011 17:22:11 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756253Ab1FFRWJ (ORCPT ); Mon, 6 Jun 2011 13:22:09 -0400 Received: from moutng.kundenserver.de ([212.227.126.171]:51619 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755956Ab1FFRWG (ORCPT ); Mon, 6 Jun 2011 13:22:06 -0400 Received: from axis700.grange (dslb-178-006-245-001.pools.arcor-ip.net [178.6.245.1]) by mrelayeu.kundenserver.de (node=mrbap3) with ESMTP (Nemesis) id 0LhePx-1Ppx9Q0W4v-00mvbh; Mon, 06 Jun 2011 19:22:05 +0200 Received: by axis700.grange (Postfix, from userid 1000) id C2679189B78; Mon, 6 Jun 2011 19:22:04 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by axis700.grange (Postfix) with ESMTP id C0352189B77 for ; Mon, 6 Jun 2011 19:22:04 +0200 (CEST) Date: Mon, 6 Jun 2011 19:22:04 +0200 (CEST) From: Guennadi Liakhovetski X-X-Sender: lyakh@axis700.grange To: Linux Media Mailing List Subject: [PATCH] V4L: soc-camera: remove now unused soc-camera .enum_input() operation Message-ID: MIME-Version: 1.0 X-Provags-ID: V02:K0:j7ElFQ7KQsLMpVoF1XxAD40swlXT/XMvIBjDkqy51OF Ao7JT1lEhSSNRPde7z+DSzG5lBw3Eih2hTC5a2iEOYcd0bhGjk H/eKQlnIuxqv6IxXbTbGXpOHuP7z4UQIsKXD6m9b4jzl3F3Y2J CBPSCWr8on24rFFhc+2Q56J4aI0HPUuRmwHCfKfikiqqWlf6DJ Kjx4dRLgDIQDksKLYH7laiewBsnnOSlBfqw1YA1QS8= 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, 06 Jun 2011 17:22:30 +0000 (UTC) Also this functionality should be implemented, if needed, using the v4l2-subdev API. Signed-off-by: Guennadi Liakhovetski --- drivers/media/video/soc_camera.c | 13 ++++--------- include/media/soc_camera.h | 1 - 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c index 3988643..faf1e6c 100644 --- a/drivers/media/video/soc_camera.c +++ b/drivers/media/video/soc_camera.c @@ -199,20 +199,15 @@ static int soc_camera_try_fmt_vid_cap(struct file *file, void *priv, static int soc_camera_enum_input(struct file *file, void *priv, struct v4l2_input *inp) { - struct soc_camera_device *icd = file->private_data; int ret = 0; if (inp->index != 0) return -EINVAL; - if (icd->ops->enum_input) - ret = icd->ops->enum_input(icd, inp); - else { - /* default is camera */ - inp->type = V4L2_INPUT_TYPE_CAMERA; - inp->std = V4L2_STD_UNKNOWN; - strcpy(inp->name, "Camera"); - } + /* default is camera */ + inp->type = V4L2_INPUT_TYPE_CAMERA; + inp->std = V4L2_STD_UNKNOWN; + strcpy(inp->name, "Camera"); return ret; } diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h index 790f422..5a26d4e 100644 --- a/include/media/soc_camera.h +++ b/include/media/soc_camera.h @@ -206,7 +206,6 @@ struct soc_camera_ops { int (*resume)(struct soc_camera_device *); unsigned long (*query_bus_param)(struct soc_camera_device *); int (*set_bus_param)(struct soc_camera_device *, unsigned long); - int (*enum_input)(struct soc_camera_device *, struct v4l2_input *); const struct v4l2_queryctrl *controls; int num_controls; };