From patchwork Thu Jun 20 09:36:06 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: 18013 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f197.google.com (mail-vc0-f197.google.com [209.85.220.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2247A2393D for ; Thu, 20 Jun 2013 09:38:44 +0000 (UTC) Received: by mail-vc0-f197.google.com with SMTP id ha12sf8395314vcb.8 for ; Thu, 20 Jun 2013 02:38:44 -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=5NUqgDaCfnXesS/symgmX8vB9d79F707ebDYVXqxmY8=; b=PbhjIaRd+VhE/Mw8fSAPVsdlpyy+BJsIL5xn37Rd7xrv4X2vl3ZCjn7QF7CPAhGqem o1HhVLeSP+ib5zRj2jqBaKmZrTE6DWZ/Duni+1vVKomP6GeUh1osaEXf+jle44Qs68/Z mvCGsq1z2Ii5TWMmWvtkizDYzoQt9b6Yj3CrJs21mxgo769LXeohq38KF5nUoxj8BfOO tuUoyclX9zzD7WsNZL8lRwf2/xBmfKvsRUTbVPFoH+hecSUeKWOLPIQHTkJnxNDphbK5 4uIIVd482L+iYbPalUMmyyhXRt16oNxNZ1hA2qfNhJSMCxe+IfQqxMU2DnY9FAPEQV5Q VgKw== X-Received: by 10.236.206.105 with SMTP id k69mr3862261yho.8.1371721123935; Thu, 20 Jun 2013 02:38:43 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.17.134 with SMTP id o6ls593572qed.33.gmail; Thu, 20 Jun 2013 02:38:43 -0700 (PDT) X-Received: by 10.52.121.7 with SMTP id lg7mr2134170vdb.68.1371721123746; Thu, 20 Jun 2013 02:38:43 -0700 (PDT) Received: from mail-vc0-f177.google.com (mail-vc0-f177.google.com [209.85.220.177]) by mx.google.com with ESMTPS id h16si5219896vcu.51.2013.06.20.02.38.43 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 20 Jun 2013 02:38:43 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.177 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.177; Received: by mail-vc0-f177.google.com with SMTP id hv10so4505213vcb.8 for ; Thu, 20 Jun 2013 02:38:43 -0700 (PDT) X-Received: by 10.52.77.5 with SMTP id o5mr449539vdw.46.1371721123663; Thu, 20 Jun 2013 02:38:43 -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 yu8csp13850veb; Thu, 20 Jun 2013 02:38:42 -0700 (PDT) X-Received: by 10.66.182.166 with SMTP id ef6mr10905603pac.35.1371721122076; Thu, 20 Jun 2013 02:38:42 -0700 (PDT) Received: from mail-pa0-x234.google.com (mail-pa0-x234.google.com [2607:f8b0:400e:c03::234]) by mx.google.com with ESMTPS id pl17si29911pab.208.2013.06.20.02.38.41 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 20 Jun 2013 02:38:42 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400e:c03::234 is neither permitted nor denied by best guess record for domain of manjunath.goudar@linaro.org) client-ip=2607:f8b0:400e:c03::234; Received: by mail-pa0-f52.google.com with SMTP id kq13so6135956pab.11 for ; Thu, 20 Jun 2013 02:38:41 -0700 (PDT) X-Received: by 10.66.0.7 with SMTP id 7mr10436946paa.199.1371721121670; Thu, 20 Jun 2013 02:38:41 -0700 (PDT) Received: from localhost.localdomain ([223.239.144.192]) by mx.google.com with ESMTPSA id kq2sm35530pab.19.2013.06.20.02.38.35 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 20 Jun 2013 02:38:40 -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 V4 10/11] USB: OHCI: Properly handle ohci-sm501 suspend Date: Thu, 20 Jun 2013 15:06:06 +0530 Message-Id: <1371720968-7533-11-git-send-email-manjunath.goudar@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1371720968-7533-1-git-send-email-manjunath.goudar@linaro.org> References: <1371050918-29472-1-git-send-email-manjunath.goudar@linaro.org> <1371720968-7533-1-git-send-email-manjunath.goudar@linaro.org> X-Gm-Message-State: ALoCoQmZoGrj32xv7AACTd3XlabdnW5yP8fyrESRbMeVdM7v+x334ISwGSZqYJ4/NnOdz5s778f7 X-Original-Sender: manjunath.goudar@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.177 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-sm501 glue was not properly handled as it was not suspending generic part of ohci controller. Calling explicitly the ohci_suspend() routine in ohci_sm501_suspend() will ensure proper handling of suspend scenario. Signed-off-by: Manjunath Goudar Cc: Arnd Bergmann Cc: Alan Stern 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-sm501.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/usb/host/ohci-sm501.c b/drivers/usb/host/ohci-sm501.c index d479d5d..2a5de5f 100644 --- a/drivers/usb/host/ohci-sm501.c +++ b/drivers/usb/host/ohci-sm501.c @@ -216,14 +216,21 @@ static int ohci_hcd_sm501_drv_remove(struct platform_device *pdev) static int ohci_sm501_suspend(struct platform_device *pdev, pm_message_t msg) { struct device *dev = &pdev->dev; - struct ohci_hcd *ohci = hcd_to_ohci(platform_get_drvdata(pdev)); + struct usb_hcd *hcd = platform_get_drvdata(pdev); + struct ohci_hcd *ohci = hcd_to_ohci(hcd); + bool do_wakeup = device_may_wakeup(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; + sm501_unit_power(dev->parent, SM501_GATE_USB_HOST, 0); - return 0; + return ret; } static int ohci_sm501_resume(struct platform_device *pdev)