From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753327AbcGYSsG (ORCPT ); Mon, 25 Jul 2016 14:48:06 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:39239 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752818AbcGYSsC (ORCPT ); Mon, 25 Jul 2016 14:48:02 -0400 From: robert.foss@collabora.com To: mathias.nyman@intel.com, gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, abrestic@chromium.org Subject: [PATCH 1/2] usb: xhci: plat: Enable runtime PM Date: Mon, 25 Jul 2016 14:47:53 -0400 Message-Id: <1469472474-27521-1-git-send-email-robert.foss@collabora.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andrew Bresticker Enable runtime PM for the xhci-plat device so that the parent device may implement runtime PM. Signed-off-by: Andrew Bresticker --- drivers/usb/host/xhci-plat.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c index 05647e6..1927950 100644 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c @@ -182,6 +182,9 @@ static int xhci_plat_probe(struct platform_device *pdev) if (ret) goto dealloc_usb2_hcd; + pm_runtime_set_active(&pdev->dev); + pm_runtime_enable(&pdev->dev); + return 0; @@ -210,6 +213,8 @@ static int xhci_plat_remove(struct platform_device *dev) struct xhci_hcd *xhci = hcd_to_xhci(hcd); struct clk *clk = xhci->clk; + pm_runtime_disable(&dev->dev); + usb_remove_hcd(xhci->shared_hcd); usb_phy_shutdown(hcd->usb_phy); @@ -228,7 +233,9 @@ static int xhci_plat_suspend(struct device *dev) { struct usb_hcd *hcd = dev_get_drvdata(dev); struct xhci_hcd *xhci = hcd_to_xhci(hcd); + int ret; + pm_runtime_get_sync(dev); /* * xhci_suspend() needs `do_wakeup` to know whether host is allowed * to do wakeup during suspend. Since xhci_plat_suspend is currently @@ -237,15 +244,23 @@ static int xhci_plat_suspend(struct device *dev) * reconsider this when xhci_plat_suspend enlarges its scope, e.g., * also applies to runtime suspend. */ - return xhci_suspend(xhci, device_may_wakeup(dev)); + ret = xhci_suspend(xhci, device_may_wakeup(dev)); + pm_runtime_put(dev); + + return ret; } static int xhci_plat_resume(struct device *dev) { struct usb_hcd *hcd = dev_get_drvdata(dev); struct xhci_hcd *xhci = hcd_to_xhci(hcd); + int ret; - return xhci_resume(xhci, 0); + pm_runtime_get_sync(dev); + ret = xhci_resume(xhci, 0); + pm_runtime_put(dev); + + return ret; } static const struct dev_pm_ops xhci_plat_pm_ops = { -- 2.7.4