Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760814Ab3DBIsZ (ORCPT ); Tue, 2 Apr 2013 04:48:25 -0400 Received: from ams-iport-3.cisco.com ([144.254.224.146]:26947 "EHLO ams-iport-3.cisco.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754165Ab3DBIsX (ORCPT ); Tue, 2 Apr 2013 04:48:23 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AgEFAIWaWlGQ/khM/2dsb2JhbABDhlu8I4EBFnSCHwEBBAEjBFIQCxUDAgImAgIhNgYBEogCAwkGrmWCQIYkDYlbgSOLNoJGCweCLYETA5ULgWCJc4F9hRuDDTo X-IronPort-AV: E=Sophos;i="4.87,392,1363132800"; d="scan'208";a="12566313" From: Hans Verkuil To: Prabhakar lad , Laurent Pinchart Subject: Re: [PATCH v2] davinci: vpif: add pm_runtime support Date: Tue, 2 Apr 2013 10:47:58 +0200 User-Agent: KMail/1.13.7 (Linux/3.7-7.slh.1-aptosid-amd64; KDE/4.8.4; x86_64; ; ) Cc: DLOS , LMML , LKML , Mauro Carvalho Chehab , Sakari Ailus , Sekhar Nori References: <1364798210-31517-1-git-send-email-prabhakar.csengg@gmail.com> In-Reply-To: <1364798210-31517-1-git-send-email-prabhakar.csengg@gmail.com> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201304021047.58951.hverkuil@xs4all.nl> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2949 Lines: 106 On Mon 1 April 2013 08:36:50 Prabhakar lad wrote: > From: Lad, Prabhakar > > Add pm_runtime support to the TI Davinci VPIF driver. > > Signed-off-by: Lad, Prabhakar > Cc: Mauro Carvalho Chehab > Cc: Hans Verkuil > Cc: Laurent Pinchart > Cc: Sakari Ailus > Cc: Sekhar Nori > --- > Changes for v2: > 1: Removed use of clk API as pointed by Laurent and Sekhar. > > drivers/media/platform/davinci/vpif.c | 24 +++++++----------------- > 1 files changed, 7 insertions(+), 17 deletions(-) > > diff --git a/drivers/media/platform/davinci/vpif.c b/drivers/media/platform/davinci/vpif.c > index 28638a8..599cabb 100644 > --- a/drivers/media/platform/davinci/vpif.c > +++ b/drivers/media/platform/davinci/vpif.c > @@ -23,8 +23,8 @@ > #include > #include > #include > -#include > #include > +#include > #include > > #include > @@ -44,7 +44,6 @@ static struct resource *res; > spinlock_t vpif_lock; > > void __iomem *vpif_base; > -struct clk *vpif_clk; > > /** > * ch_params: video standard configuration parameters for vpif > @@ -439,19 +438,15 @@ static int vpif_probe(struct platform_device *pdev) > goto fail; > } > > - vpif_clk = clk_get(&pdev->dev, "vpif"); > - if (IS_ERR(vpif_clk)) { > - status = PTR_ERR(vpif_clk); > - goto clk_fail; > - } > - clk_prepare_enable(vpif_clk); > + pm_runtime_enable(&pdev->dev); > + pm_runtime_resume(&pdev->dev); > + > + pm_runtime_get(&pdev->dev); pm_runtime_get() calls pm_runtime_resume() if needed, so is the call to resume() really necessary? Regards, Hans > > spin_lock_init(&vpif_lock); > dev_info(&pdev->dev, "vpif probe success\n"); > return 0; > > -clk_fail: > - iounmap(vpif_base); > fail: > release_mem_region(res->start, res_len); > return status; > @@ -459,11 +454,6 @@ fail: > > static int vpif_remove(struct platform_device *pdev) > { > - if (vpif_clk) { > - clk_disable_unprepare(vpif_clk); > - clk_put(vpif_clk); > - } > - > iounmap(vpif_base); > release_mem_region(res->start, res_len); > return 0; > @@ -472,13 +462,13 @@ static int vpif_remove(struct platform_device *pdev) > #ifdef CONFIG_PM > static int vpif_suspend(struct device *dev) > { > - clk_disable_unprepare(vpif_clk); > + pm_runtime_put(dev); > return 0; > } > > static int vpif_resume(struct device *dev) > { > - clk_prepare_enable(vpif_clk); > + pm_runtime_get(dev); > return 0; > } > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/