From patchwork Wed Nov 13 12:10:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Majunath Goudar X-Patchwork-Id: 3178031 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E0F7C9F3A0 for ; Wed, 13 Nov 2013 12:14:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ADD9920621 for ; Wed, 13 Nov 2013 12:13:59 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EACCE20111 for ; Wed, 13 Nov 2013 12:13:54 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VgZIo-0005S7-JR; Wed, 13 Nov 2013 12:12:12 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VgZIL-0006QL-RE; Wed, 13 Nov 2013 12:11:41 +0000 Received: from mail-pb0-x234.google.com ([2607:f8b0:400e:c01::234]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VgZII-0006MT-Gv for linux-arm-kernel@lists.infradead.org; Wed, 13 Nov 2013 12:11:39 +0000 Received: by mail-pb0-f52.google.com with SMTP id rr4so320620pbb.39 for ; Wed, 13 Nov 2013 04:10:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=suOtoozCTG6Hf5AOAt7ATE7vZJ6HeH+Ld+Jb+O6ABk8=; b=y7veVpCVn5tY1NLVPaypDu8qrMVv89CswbOuv3shU+DBf7gr0ekjRb/JsbGRkCZxIg GdP2F+X5yGpO9HN6cv3qL9pbzOkwQLoFwecYC4fhk2lVGxhmOhYQn+1NvAc9cyY4Hx2a ffgZ0pR5tRdWoJ9uH7MtgkUOjoqlzv3k1Iyu2bxrnW3VjUHDcLA051jTaFIYUopg9DQ4 NrfEo2oOHvVAm2rPYj2584fo8+tTgRYYBcxgL6rK0OYn4KfUCSoyN746LAUcXF2Gsucx vHthOFmvIXvzyDumdB0FkrPSyIXHffcQKWRu6U+HXDQBXqLyYek5FbvIGEsinxIkvlTR dK5g== X-Received: by 10.67.23.227 with SMTP id id3mr42117370pad.101.1384344657244; Wed, 13 Nov 2013 04:10:57 -0800 (PST) Received: from manjunath-Latitude-E6420.LGE.NET ([203.247.149.152]) by mx.google.com with ESMTPSA id qf7sm51287959pac.14.2013.11.13.04.10.52 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 13 Nov 2013 04:10:56 -0800 (PST) From: Majunath Goudar To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 4/6] USB: OHCI: Properly handle ohci-da8xx suspend Date: Wed, 13 Nov 2013 17:40:19 +0530 Message-Id: <1384344621-6981-5-git-send-email-csmanjuvijay@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1384344621-6981-1-git-send-email-csmanjuvijay@gmail.com> References: <1380708947-15966-1-git-send-email-csmanjuvijay@gmail.com> <1384344621-6981-1-git-send-email-csmanjuvijay@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131113_071138_731244_7336AC6C X-CRM114-Status: GOOD ( 12.59 ) X-Spam-Score: 0.1 (/) Cc: Greg KH , nataraja.km@lge.com, Majunath Goudar , Arnd Bergmann , linux-usb@vger.kernel.or X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_BL_SPAMCOP_NET,RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_WEB,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Suspend scenario in case of ohci-da8xx glue was not properly handled as it was not suspending generic part of ohci controller. Alan Stern suggested, properly handle ohci-da8xx suspend scenario. Calling explicitly the ohci_suspend() routine in ohci_da8xx_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.or --- drivers/usb/host/ohci-da8xx.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/usb/host/ohci-da8xx.c b/drivers/usb/host/ohci-da8xx.c index 9be59f1..71dbd85 100644 --- a/drivers/usb/host/ohci-da8xx.c +++ b/drivers/usb/host/ohci-da8xx.c @@ -406,19 +406,27 @@ static int ohci_hcd_da8xx_drv_remove(struct platform_device *dev) } #ifdef CONFIG_PM -static int ohci_da8xx_suspend(struct platform_device *dev, pm_message_t message) +static int ohci_da8xx_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); + 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; + ohci_da8xx_clock(0); hcd->state = HC_STATE_SUSPENDED; - dev->dev.power.power_state = PMSG_SUSPEND; - return 0; + + return ret; } static int ohci_da8xx_resume(struct platform_device *dev)