From patchwork Sat Jul 16 00:13:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 980982 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p6G0Dms3000748 for ; Sat, 16 Jul 2011 00:13:48 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751163Ab1GPANn (ORCPT ); Fri, 15 Jul 2011 20:13:43 -0400 Received: from moutng.kundenserver.de ([212.227.126.171]:62572 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750934Ab1GPANm (ORCPT ); Fri, 15 Jul 2011 20:13:42 -0400 Received: from axis700.grange (dslb-178-001-145-049.pools.arcor-ip.net [178.1.145.49]) by mrelayeu.kundenserver.de (node=mrbap1) with ESMTP (Nemesis) id 0LoKJV-1RNnps0N9F-00geCf; Sat, 16 Jul 2011 02:13:41 +0200 Received: by axis700.grange (Postfix, from userid 1000) id BBD33189B6E; Sat, 16 Jul 2011 02:13:40 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by axis700.grange (Postfix) with ESMTP id B8F73189B6D; Sat, 16 Jul 2011 02:13:40 +0200 (CEST) Date: Sat, 16 Jul 2011 02:13:40 +0200 (CEST) From: Guennadi Liakhovetski X-X-Sender: lyakh@axis700.grange To: Linux Media Mailing List cc: Robert Jarzmik Subject: [PATCH 1/6] V4L: pxa-camera: switch to using standard PM hooks In-Reply-To: Message-ID: References: MIME-Version: 1.0 X-Provags-ID: V02:K0:3gdl8ULqRBa7amw4HWOU6RYkhZg30Pgu6D8NfdXE+KA DXujR8lWvk8kkghTKlQ7BmRtLdRkDWBQx6LRuPkE5ggLbEr3U1 4hx7QGPWNz8SKZNe4Pazio2gq+/tSgAUwxLhBKeujdD3BlPih8 9g6+z3jtFsqZ/66oDHdS8kAwAkrcsJR9X7jKftEnmQsPkmewam dlusIIhEN60IFTfd1Hg+UAa6s4KCcQi4ln3FoqF3/Y= 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]); Sat, 16 Jul 2011 00:13:49 +0000 (UTC) The pxa-camera driver doesn't need soc-camera specific PM callbacks, switch it to using the standard PM hooks instead. Signed-off-by: Guennadi Liakhovetski Tested-by: Robert Jarzmik --- drivers/media/video/pxa_camera.c | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c index 3b3ad08..e0231a2 100644 --- a/drivers/media/video/pxa_camera.c +++ b/drivers/media/video/pxa_camera.c @@ -1579,9 +1579,9 @@ static int pxa_camera_querycap(struct soc_camera_host *ici, return 0; } -static int pxa_camera_suspend(struct soc_camera_device *icd, pm_message_t state) +static int pxa_camera_suspend(struct device *dev) { - struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent); + struct soc_camera_host *ici = to_soc_camera_host(dev); struct pxa_camera_dev *pcdev = ici->priv; int i = 0, ret = 0; @@ -1592,7 +1592,7 @@ static int pxa_camera_suspend(struct soc_camera_device *icd, pm_message_t state) pcdev->save_cicr[i++] = __raw_readl(pcdev->base + CICR4); if (pcdev->icd) { - struct v4l2_subdev *sd = soc_camera_to_subdev(icd); + struct v4l2_subdev *sd = soc_camera_to_subdev(pcdev->icd); ret = v4l2_subdev_call(sd, core, s_power, 0); if (ret == -ENOIOCTLCMD) ret = 0; @@ -1601,9 +1601,9 @@ static int pxa_camera_suspend(struct soc_camera_device *icd, pm_message_t state) return ret; } -static int pxa_camera_resume(struct soc_camera_device *icd) +static int pxa_camera_resume(struct device *dev) { - struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent); + struct soc_camera_host *ici = to_soc_camera_host(dev); struct pxa_camera_dev *pcdev = ici->priv; int i = 0, ret = 0; @@ -1618,7 +1618,7 @@ static int pxa_camera_resume(struct soc_camera_device *icd) __raw_writel(pcdev->save_cicr[i++], pcdev->base + CICR4); if (pcdev->icd) { - struct v4l2_subdev *sd = soc_camera_to_subdev(icd); + struct v4l2_subdev *sd = soc_camera_to_subdev(pcdev->icd); ret = v4l2_subdev_call(sd, core, s_power, 1); if (ret == -ENOIOCTLCMD) ret = 0; @@ -1635,8 +1635,6 @@ static struct soc_camera_host_ops pxa_soc_camera_host_ops = { .owner = THIS_MODULE, .add = pxa_camera_add_device, .remove = pxa_camera_remove_device, - .suspend = pxa_camera_suspend, - .resume = pxa_camera_resume, .set_crop = pxa_camera_set_crop, .get_formats = pxa_camera_get_formats, .put_formats = pxa_camera_put_formats, @@ -1821,9 +1819,15 @@ static int __devexit pxa_camera_remove(struct platform_device *pdev) return 0; } +static struct dev_pm_ops pxa_camera_pm = { + .suspend = pxa_camera_suspend, + .resume = pxa_camera_resume, +}; + static struct platform_driver pxa_camera_driver = { .driver = { .name = PXA_CAM_DRV_NAME, + .pm = &pxa_camera_pm, }, .probe = pxa_camera_probe, .remove = __devexit_p(pxa_camera_remove),