From patchwork Sat Jul 16 00:13:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 980992 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p6G0Dp8w015613 for ; Sat, 16 Jul 2011 00:13:51 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751411Ab1GPANs (ORCPT ); Fri, 15 Jul 2011 20:13:48 -0400 Received: from moutng.kundenserver.de ([212.227.126.187]:60108 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750934Ab1GPANq (ORCPT ); Fri, 15 Jul 2011 20:13:46 -0400 Received: from axis700.grange (dslb-178-001-145-049.pools.arcor-ip.net [178.1.145.49]) by mrelayeu.kundenserver.de (node=mreu1) with ESMTP (Nemesis) id 0M4miX-1RgQeC22zV-00yugY; Sat, 16 Jul 2011 02:13:45 +0200 Received: by axis700.grange (Postfix, from userid 1000) id 48911189B6E; Sat, 16 Jul 2011 02:13:45 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by axis700.grange (Postfix) with ESMTP id 397C7189B6D for ; Sat, 16 Jul 2011 02:13:45 +0200 (CEST) Date: Sat, 16 Jul 2011 02:13:45 +0200 (CEST) From: Guennadi Liakhovetski X-X-Sender: lyakh@axis700.grange To: Linux Media Mailing List Subject: [PATCH 2/6] V4L: soc-camera: remove now unused soc-camera specific PM hooks In-Reply-To: Message-ID: References: MIME-Version: 1.0 X-Provags-ID: V02:K0:8mey3sAVfmpNl3WtNyeN94Mqv94sLHEt8sizu4PvSjE F+gaYBLN0phJGcyDX5FY12spFL9fw3o9ncs8zZxVsCOPPv92Te w6ynhS+I6Lil7kRPHYENNGEqeQpx85NUsA2Rd57jh8RgoUGTTR Ml12UdhkKmk6rFgZC7XvO9VGClfSMT56+2I9ACTE8qo2qK26Ty WpCkQpxeE2dSmUVbH+tPnzxUNNkuJ3yYJjPwoAA0SM= 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]); Sat, 16 Jul 2011 00:13:51 +0000 (UTC) soc-camera host drivers shall be implementing their PM, using standard kernel methods, soc-camera specific hooks can die. Signed-off-by: Guennadi Liakhovetski --- drivers/media/video/soc_camera.c | 26 -------------------------- include/media/soc_camera.h | 2 -- 2 files changed, 0 insertions(+), 28 deletions(-) diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c index 136326e..5084e72 100644 --- a/drivers/media/video/soc_camera.c +++ b/drivers/media/video/soc_camera.c @@ -1209,36 +1209,10 @@ static int soc_camera_remove(struct device *dev) return 0; } -static int soc_camera_suspend(struct device *dev, pm_message_t state) -{ - struct soc_camera_device *icd = to_soc_camera_dev(dev); - struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent); - int ret = 0; - - if (ici->ops->suspend) - ret = ici->ops->suspend(icd, state); - - return ret; -} - -static int soc_camera_resume(struct device *dev) -{ - struct soc_camera_device *icd = to_soc_camera_dev(dev); - struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent); - int ret = 0; - - if (ici->ops->resume) - ret = ici->ops->resume(icd); - - return ret; -} - struct bus_type soc_camera_bus_type = { .name = "soc-camera", .probe = soc_camera_probe, .remove = soc_camera_remove, - .suspend = soc_camera_suspend, - .resume = soc_camera_resume, }; EXPORT_SYMBOL_GPL(soc_camera_bus_type); diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h index 21dd8a4..70c4ea5 100644 --- a/include/media/soc_camera.h +++ b/include/media/soc_camera.h @@ -66,8 +66,6 @@ struct soc_camera_host_ops { struct module *owner; int (*add)(struct soc_camera_device *); void (*remove)(struct soc_camera_device *); - int (*suspend)(struct soc_camera_device *, pm_message_t); - int (*resume)(struct soc_camera_device *); /* * .get_formats() is called for each client device format, but * .put_formats() is only called once. Further, if any of the calls to