From patchwork Wed Dec 12 09:37:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Baltieri X-Patchwork-Id: 13496 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 034764C17AA for ; Wed, 12 Dec 2012 10:25:33 +0000 (UTC) Received: from mail-ie0-f182.google.com (mail-ie0-f182.google.com [209.85.223.182]) by fiordland.canonical.com (Postfix) with ESMTP id AAA29A18A4F for ; Wed, 12 Dec 2012 10:25:32 +0000 (UTC) Received: by mail-ie0-f182.google.com with SMTP id s9so1655964iec.27 for ; Wed, 12 Dec 2012 02:25:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :resent-from:resent-date:resent-message-id:resent-to:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=02P4xv7GoSfUvqSuFAi5Rvhkq7XK4l0bEdth1wfSkSU=; b=dkAnH9YibMPU0s/fu3tmVxMZZcDQILvNA+yfLwNzvcQmnG5vnA9z5WtXDJltk+/tG6 emhbDznOWZvvCOsC5XHSR1YFBnOfo++ZUMjK57CxbK3D2T4g2RBCuu4HGO81tJdkec2B lQOPPGqaroK5xliQ8t1cfm4OW0D0jBCsYnS1jObMKt9FoykEmTUYwEB7JzE1UsgqrHzc AFdcdy045/5AHC77wevQp1MsiTNc+tbBctAf5Ckg5b7VzQt4oqgsBe15xkDN6SMDnm3i IzrPrzsKiUcuH5crQ6ANJwm8/2RErVEz8j1p2T/3QiEvu3Pw+xjSRndFcVDFg3qEL0mY fV6w== Received: by 10.50.185.166 with SMTP id fd6mr12640219igc.62.1355307932110; Wed, 12 Dec 2012 02:25:32 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp190157igt; Wed, 12 Dec 2012 02:25:31 -0800 (PST) Received: by 10.14.221.65 with SMTP id q41mr1564528eep.30.1355307931204; Wed, 12 Dec 2012 02:25:31 -0800 (PST) Received: from mail-ea0-f182.google.com (mail-ea0-f182.google.com [209.85.215.182]) by mx.google.com with ESMTPS id i42si62150875eem.124.2012.12.12.02.25.30 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 12 Dec 2012 02:25:31 -0800 (PST) Received-SPF: neutral (google.com: 209.85.215.182 is neither permitted nor denied by best guess record for domain of fabio.baltieri@linaro.org) client-ip=209.85.215.182; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.215.182 is neither permitted nor denied by best guess record for domain of fabio.baltieri@linaro.org) smtp.mail=fabio.baltieri@linaro.org Received: by mail-ea0-f182.google.com with SMTP id a14so169661eaa.41 for ; Wed, 12 Dec 2012 02:25:30 -0800 (PST) Received: by 10.14.173.65 with SMTP id u41mr1567058eel.13.1355307930645; Wed, 12 Dec 2012 02:25:30 -0800 (PST) Received: from localhost ([2a01:2003:1:1d66:8e70:5aff:feac:ad8]) by mx.google.com with ESMTPS id v46sm55047324eep.1.2012.12.12.02.25.29 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 12 Dec 2012 02:25:30 -0800 (PST) Resent-From: Fabio Baltieri Resent-Date: Wed, 12 Dec 2012 11:25:22 +0100 Resent-Message-ID: <20121212102522.GF10536@balto.lan> Resent-To: patches@linaro.org Received: from localhost ([2a01:2003:1:1d66:8e70:5aff:feac:ad8]) by mx.google.com with ESMTPS id 43sm54815010eed.10.2012.12.12.01.38.24 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 12 Dec 2012 01:38:25 -0800 (PST) From: Fabio Baltieri To: Linus Walleij , Srinidhi Kasagar Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Narayanan G , Fabio Baltieri Subject: [PATCH 5/7] dmaengine: ste_dma40: don't check for pm_runtime_suspended() Date: Wed, 12 Dec 2012 10:37:19 +0100 Message-Id: <1355305041-2338-6-git-send-email-fabio.baltieri@linaro.org> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1355305041-2338-1-git-send-email-fabio.baltieri@linaro.org> References: <1355305041-2338-1-git-send-email-fabio.baltieri@linaro.org> X-Gm-Message-State: ALoCoQmLnW3g15ZJVxHa+N4hUB60oSBCt846FWNxE/u7jP+nb2LfA1BrCetwB0OyjZGpZzED6tcO From: Narayanan G The check for runtime suspend is not needed during a regular suspend, as the framework takes care of this. This fixes the issue of DMA driver not letting the system to go to deepsleep in the first attempt. Signed-off-by: Narayanan G Reviewed-by: Rabin Vincent Acked-by: Linus Walleij Signed-off-by: Fabio Baltieri --- drivers/dma/ste_dma40.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c index 0b80ee9..d8d58d9 100644 --- a/drivers/dma/ste_dma40.c +++ b/drivers/dma/ste_dma40.c @@ -2783,8 +2783,6 @@ static int dma40_pm_suspend(struct device *dev) struct platform_device *pdev = to_platform_device(dev); struct d40_base *base = platform_get_drvdata(pdev); int ret = 0; - if (!pm_runtime_suspended(dev)) - return -EBUSY; if (base->lcpa_regulator) ret = regulator_disable(base->lcpa_regulator);