From patchwork Fri Sep 28 11:21:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 11839 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 CD4AD24150 for ; Fri, 28 Sep 2012 11:21:51 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 86B1AA1897D for ; Fri, 28 Sep 2012 11:21:51 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so6600534iej.11 for ; Fri, 28 Sep 2012 04:21:51 -0700 (PDT) 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:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:x-gm-message-state; bh=JcohN3JU+q54WMJy3rSoEzo43U51DqVZ2feEHOLCsoU=; b=V+mW5u6mEAixqGH6ShfPvRCshRUiVPKYDm7BFQiG9mZof+ol2KRul0L/4zhVcD9++B zU06uzZBDc3GYWAToBSqhCEDXWsn6jwLBMRY1MMzCD1MsNET96Qf6KjnwKU9dX6mGoaY T7fOstM35Kcc1uAz8um2ot3UXnesbed3v6H81Tvb9G9FmPwUu6h4CAfl9y27q+tMcuI5 eSMHI+umTXrFlV2W9ZNt+430gSapKlbYxqeIN3fPxC0e/HeKPgLn80CEmWTGIEbcZ71S xS4zCzuClODaq5+JyjcEEYZe+fEsXKuXQ3ZtliTfjqJ6Rkklj+VkJFX5y7FG2AFWpqj9 Wr2Q== Received: by 10.50.217.229 with SMTP id pb5mr1291423igc.28.1348831311302; Fri, 28 Sep 2012 04:21:51 -0700 (PDT) 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.184.232 with SMTP id ex8csp466161igc; Fri, 28 Sep 2012 04:21:50 -0700 (PDT) Received: by 10.14.220.134 with SMTP id o6mr9578648eep.35.1348831308890; Fri, 28 Sep 2012 04:21:48 -0700 (PDT) Received: from eu1sys200aog112.obsmtp.com (eu1sys200aog112.obsmtp.com [207.126.144.133]) by mx.google.com with SMTP id 42si1006420eee.24.2012.09.28.04.21.36 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 28 Sep 2012 04:21:48 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.133 is neither permitted nor denied by best guess record for domain of ulf.hansson@stericsson.com) client-ip=207.126.144.133; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.133 is neither permitted nor denied by best guess record for domain of ulf.hansson@stericsson.com) smtp.mail=ulf.hansson@stericsson.com Received: from beta.dmz-ap.st.com ([138.198.100.35]) (using TLSv1) by eu1sys200aob112.postini.com ([207.126.147.11]) with SMTP ID DSNKUGWIPitsXT+dHQKYwccuXM1IHO3iUAud@postini.com; Fri, 28 Sep 2012 11:21:48 UTC Received: from zeta.dmz-ap.st.com (ns6.st.com [138.198.234.13]) by beta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 77A4BC7; Fri, 28 Sep 2012 11:13:17 +0000 (GMT) Received: from relay1.stm.gmessaging.net (unknown [10.230.100.17]) by zeta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 2E815102B; Fri, 28 Sep 2012 11:21:30 +0000 (GMT) Received: from exdcvycastm022.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm022", Issuer "exdcvycastm022" (not verified)) by relay1.stm.gmessaging.net (Postfix) with ESMTPS id 3BDB824C30D; Fri, 28 Sep 2012 13:21:23 +0200 (CEST) Received: from steludxu1397.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.30) with Microsoft SMTP Server (TLS) id 8.3.83.0; Fri, 28 Sep 2012 13:21:28 +0200 From: Ulf Hansson To: Grant Likely , Cc: , Linus Walleij , Vipul Kumar Samar , Viresh Kumar , Russell King , Ulf Hansson Subject: [PATCH 2/3] Revert "spi/pl022: enable runtime PM" Date: Fri, 28 Sep 2012 13:21:05 +0200 Message-ID: <1348831266-16721-3-git-send-email-ulf.hansson@stericsson.com> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1348831266-16721-1-git-send-email-ulf.hansson@stericsson.com> References: <1348831266-16721-1-git-send-email-ulf.hansson@stericsson.com> MIME-Version: 1.0 X-Gm-Message-State: ALoCoQkPrcpskc/xI0jugWuO7YSEQlVkT0wnnHVQJchbLhqYqpmLR6D/Lue+srat0X7GeHGvsnFI From: Ulf Hansson This reverts commit 2fb30d1147c599f5657e8c62c862f9a0f58d9d99. Signed-off-by: Ulf Hansson --- drivers/spi/spi-pl022.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c index 3f2f36c..05cfb61e 100644 --- a/drivers/spi/spi-pl022.c +++ b/drivers/spi/spi-pl022.c @@ -2188,9 +2188,6 @@ pl022_probe(struct amba_device *adev, const struct amba_id *id) printk(KERN_INFO "pl022: mapped registers from 0x%08x to %p\n", adev->res.start, pl022->virtbase); - pm_runtime_enable(dev); - pm_runtime_resume(dev); - pl022->clk = clk_get(&adev->dev, NULL); if (IS_ERR(pl022->clk)) { status = PTR_ERR(pl022->clk); @@ -2303,7 +2300,6 @@ pl022_remove(struct amba_device *adev) clk_disable(pl022->clk); clk_unprepare(pl022->clk); clk_put(pl022->clk); - pm_runtime_disable(&adev->dev); iounmap(pl022->virtbase); amba_release_regions(adev); tasklet_disable(&pl022->pump_transfers);