From patchwork Tue Jun 7 10:11:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 855672 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 p57ABjZP011116 for ; Tue, 7 Jun 2011 10:11:45 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752770Ab1FGKLn (ORCPT ); Tue, 7 Jun 2011 06:11:43 -0400 Received: from moutng.kundenserver.de ([212.227.126.186]:57785 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752744Ab1FGKLn (ORCPT ); Tue, 7 Jun 2011 06:11:43 -0400 Received: from axis700.grange (dslb-094-221-030-184.pools.arcor-ip.net [94.221.30.184]) by mrelayeu.kundenserver.de (node=mreu3) with ESMTP (Nemesis) id 0M31Ih-1Pc4Hh0VgV-00swsy; Tue, 07 Jun 2011 12:11:42 +0200 Received: by axis700.grange (Postfix, from userid 1000) id C5ECD189B78; Tue, 7 Jun 2011 12:11:41 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by axis700.grange (Postfix) with ESMTP id C399E189B77 for ; Tue, 7 Jun 2011 12:11:41 +0200 (CEST) Date: Tue, 7 Jun 2011 12:11:41 +0200 (CEST) From: Guennadi Liakhovetski X-X-Sender: lyakh@axis700.grange To: Linux Media Mailing List Subject: [PATCH v2] V4L: soc-camera: remove several now unused soc-camera client operations Message-ID: MIME-Version: 1.0 X-Provags-ID: V02:K0:pc8nDBXWJQRdKSrJDYCSq6/+sJq4fPx+4FhHEVZuEU+ LxJ5NeRqqrXErOKwLf0TyKLW/nwdg7hedqDIW6JrQKpohmukTO /0E5Ny5ByBfXzt4C8jv+zQO2bt5x9IrdEsJ9NemWoUZuQTeqpF uhARhcejSibzO1gABOjL3Zh4r8T9SHq4Q0jp62QQKCmcNbUWgr 1SPDTacHYayxsPO8T9LJ6Wzg6Iu1EErVPMZyVLDZyE= 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]); Tue, 07 Jun 2011 10:11:45 +0000 (UTC) This patch removes .enum_input(), .suspend() and .resume() soc-camera client operations. Functionality, provided by .enum_input(), if needed, can be implemented using the v4l2-subdev API. As for .suspend() and .resume(), the only client driver, implementing these methods has been mt9m111, and the only host driver, using them has been pxa-camera. Now that both those drivers have been converted to the standard subdev .s_power() operation, .suspend() and .resume() can be removed. Signed-off-by: Guennadi Liakhovetski --- v2: also remove .suspend() and .resume() drivers/media/video/soc_camera.c | 17 +++++------------ include/media/soc_camera.h | 3 --- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c index 4e4d412..136326e 100644 --- a/drivers/media/video/soc_camera.c +++ b/drivers/media/video/soc_camera.c @@ -199,22 +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; + return 0; } static int soc_camera_g_input(struct file *file, void *priv, unsigned int *i) diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h index 790f422..7791c0e 100644 --- a/include/media/soc_camera.h +++ b/include/media/soc_camera.h @@ -202,11 +202,8 @@ struct soc_camera_format_xlate { }; struct soc_camera_ops { - int (*suspend)(struct soc_camera_device *, pm_message_t state); - 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; };