From patchwork Mon Jul 22 09:32:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: manjunath.goudar@linaro.org X-Patchwork-Id: 18479 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vb0-f70.google.com (mail-vb0-f70.google.com [209.85.212.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D713725E1F for ; Mon, 22 Jul 2013 09:33:59 +0000 (UTC) Received: by mail-vb0-f70.google.com with SMTP id q12sf8340400vbe.1 for ; Mon, 22 Jul 2013 02:33:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-beenthere:x-forwarded-to:x-forwarded-for :delivered-to:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=2Ktvla48lTvqqRrILp74RXbjvblOz5rgOQATC3fGbCM=; b=Z7/NgfK5IbIyYqgRxWUg5Fq8vB1UQsVUkA2yWXzJBJtoL5uTEwDOEIN2IKL9poZBix ZLRryb17pB/nEn1QSolgaGGPeSt7FISR3EF27WlCxPgkEd8AHDPrZYWdp4Sqqxh/IO7C 2z9otqBcUYtPCWW/ZvDfqGthYHbxJcvB2I15BqKyVV3lEwz+NHM+gZxhXrpGtK9o8/jq 6ujQgSD/YNaGFOPTOq+V9er1bIJtKY0A1FjvZvp4i3/tpQY2EVZ/2F7sxVaa+Bj7dEt4 +Exa78TQBt/SihFqWBEVruBJ7VgwIV5e+R1UM/ojgB0k7g48I+j3A387kfWU4Jmlccux FodQ== X-Received: by 10.236.79.67 with SMTP id h43mr14982266yhe.46.1374485639505; Mon, 22 Jul 2013 02:33:59 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.94.212 with SMTP id de20ls2785887qeb.44.gmail; Mon, 22 Jul 2013 02:33:59 -0700 (PDT) X-Received: by 10.52.93.106 with SMTP id ct10mr7534229vdb.83.1374485639367; Mon, 22 Jul 2013 02:33:59 -0700 (PDT) Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com [209.85.220.179]) by mx.google.com with ESMTPS id im6si6845196vdb.46.2013.07.22.02.33.59 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 22 Jul 2013 02:33:59 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.179; Received: by mail-vc0-f179.google.com with SMTP id id13so1150459vcb.38 for ; Mon, 22 Jul 2013 02:33:59 -0700 (PDT) X-Received: by 10.52.27.172 with SMTP id u12mr7508029vdg.64.1374485639291; Mon, 22 Jul 2013 02:33:59 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.165.8 with SMTP id yu8csp46468veb; Mon, 22 Jul 2013 02:33:58 -0700 (PDT) X-Received: by 10.68.59.98 with SMTP id y2mr29323163pbq.135.1374485638067; Mon, 22 Jul 2013 02:33:58 -0700 (PDT) Received: from mail-pa0-f53.google.com (mail-pa0-f53.google.com [209.85.220.53]) by mx.google.com with ESMTPS id km7si18167384pbc.185.2013.07.22.02.33.57 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 22 Jul 2013 02:33:58 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.53 is neither permitted nor denied by best guess record for domain of manjunath.goudar@linaro.org) client-ip=209.85.220.53; Received: by mail-pa0-f53.google.com with SMTP id lb1so51929pab.26 for ; Mon, 22 Jul 2013 02:33:57 -0700 (PDT) X-Received: by 10.68.240.72 with SMTP id vy8mr29596932pbc.161.1374485637692; Mon, 22 Jul 2013 02:33:57 -0700 (PDT) Received: from localhost.localdomain ([223.239.144.229]) by mx.google.com with ESMTPSA id bb1sm24977759pbc.10.2013.07.22.02.33.51 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 22 Jul 2013 02:33:55 -0700 (PDT) From: Manjunath Goudar To: linux-usb@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, patches@linaro.org, stern@rowland.harvard.edu, arnd@linaro.org, manjunath.goudar@linaro.org, linaro-kernel@lists.linaro.org, Arnd Bergmann , Greg KH Subject: [PATCH 11/11] USB: OHCI: Properly handle ohci-spear suspend Date: Mon, 22 Jul 2013 15:02:46 +0530 Message-Id: <1374485566-3997-12-git-send-email-manjunath.goudar@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1374485566-3997-1-git-send-email-manjunath.goudar@linaro.org> References: <1371050918-29472-1-git-send-email-manjunath.goudar@linaro.org> <1374485566-3997-1-git-send-email-manjunath.goudar@linaro.org> X-Gm-Message-State: ALoCoQn3k3MSgG5cdb5a/lDD3fY7fDvfsXuP8lNTvUKbg2TXZfMRjWApYoQv5HEgNat1IGZu9AXd X-Original-Sender: manjunath.goudar@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Suspend scenario in case of ohci-spear glue was not properly handled as it was not suspending generic part of ohci controller. Calling explicitly the ohci_suspend() routine in spear_ohci_hcd_drv_suspend() will ensure proper handling of suspend scenario. Signed-off-by: Manjunath Goudar Acked-by: Alan Stern Cc: Arnd Bergmann Cc: Greg KH Cc: linux-usb@vger.kernel.org V2: -Incase ohci_suspend() fails, return right away without executing further. V3: -Aligned variable "do_wakeup" and "ret". V4: -The do_wakeup and ret variable alignment is removed. --- drivers/usb/host/ohci-spear.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/usb/host/ohci-spear.c b/drivers/usb/host/ohci-spear.c index 31ff3fc..41148f8 100644 --- a/drivers/usb/host/ohci-spear.c +++ b/drivers/usb/host/ohci-spear.c @@ -130,20 +130,26 @@ static int spear_ohci_hcd_drv_remove(struct platform_device *pdev) } #if defined(CONFIG_PM) -static int spear_ohci_hcd_drv_suspend(struct platform_device *dev, +static int spear_ohci_hcd_drv_suspend(struct platform_device *pdev, pm_message_t message) { - struct usb_hcd *hcd = platform_get_drvdata(dev); + struct usb_hcd *hcd = platform_get_drvdata(pdev); struct ohci_hcd *ohci = hcd_to_ohci(hcd); struct spear_ohci *sohci_p = to_spear_ohci(hcd); + bool do_wakeup = device_may_wakeup(&pdev->dev); + int ret; if (time_before(jiffies, ohci->next_statechange)) msleep(5); ohci->next_statechange = jiffies; + ret = ohci_suspend(hcd, do_wakeup); + if (ret) + return ret; + clk_disable_unprepare(sohci_p->clk); - return 0; + return ret; } static int spear_ohci_hcd_drv_resume(struct platform_device *dev)