From patchwork Thu Nov 5 15:01:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 7562151 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EA5E1BEEA4 for ; Thu, 5 Nov 2015 15:02:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4FB0E2081D for ; Thu, 5 Nov 2015 15:02:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 93D82208BC for ; Thu, 5 Nov 2015 15:02:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161915AbbKEPBz (ORCPT ); Thu, 5 Nov 2015 10:01:55 -0500 Received: from mail-lb0-f181.google.com ([209.85.217.181]:35233 "EHLO mail-lb0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161710AbbKEPBy (ORCPT ); Thu, 5 Nov 2015 10:01:54 -0500 Received: by lbbes7 with SMTP id es7so37270363lbb.2 for ; Thu, 05 Nov 2015 07:01:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro_org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=q/4GLinEelQ3cqk/0au8CfvzImn+31N8G3wL4scyEsQ=; b=GYSegyzfttHm3cauU9QBYC4ZvTL69m4jxRJvBVwXKnhtsR3pOXyLdFa1fpJuma1mTt vE98t2liLx/ept4QfeByrnCo64RAV1vP9wB85UcnnAMWMjwyJKWEmC64hLSQY00Pz7gr dLnmKnOucsTwRm90xuAvvVYm+5D+a8D5IMz8fhiBXjoLXN5/1aJOsRu8eaTJmRltHgDR rcaBcRh3CrcfEYfZAVpe/K0RfYLokVWRUoOomwwQIHCxYPUZRRtuP1r6NWFYIWrYbLBs bI1SWp2PPruH2UPubpR/Qs3Dcthl2YkeyEf1eht0wekwT08rSTPQCMvrmrFgDCw6ZDkq 8OZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=q/4GLinEelQ3cqk/0au8CfvzImn+31N8G3wL4scyEsQ=; b=SfgawgBpkpP0kOWDbakyWW4+QZajmC/yy+n/cWhnfOnuzjlgZcl5UEZ5+W3KHiZd9J m6VkC+KIqlQaZPmOeGbkO9Gedk5vZQeFjnOCaM3pmaFTmsaj6ZnqUGUyoDPRx7Zu/N0D iftNfSF8Tg6wtOJZHqHZnYGTuqWjhsYIfpSAxcai/sIR/cIlKWrLtJGbuMgb0H2g9eb1 FOoRUGjkOW2O7Dqzf/04yyYKUccYTkiFrpDLsGuivfhA0PPVyYXWWHaUSd6hjqYEskgQ zM7LIyZ24trqzGmEF8MkJ29u5d1ax9OeVcbUj/HosAprIZdwp7B+fwsllYMglohay6ze Ad5w== X-Gm-Message-State: ALoCoQnglsBtETFuNFEaaT7icMOXfLiEceQsrPU1jJkrcD9BxFe4+PFH2iIsH1GZz0jR1AtMQUXh X-Received: by 10.112.199.100 with SMTP id jj4mr4150849lbc.122.1446735712990; Thu, 05 Nov 2015 07:01:52 -0800 (PST) Received: from uffe-Latitude-E6430s.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id nb1sm1013941lbb.9.2015.11.05.07.01.51 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 05 Nov 2015 07:01:52 -0800 (PST) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson Cc: Chaotian Jing , addy ke , Jaehoon Chung , linux-pm@vger.kernel.org, Android Kernel Team Subject: [PATCH 1/2] mmc: core: Make runtime resume default behavior for MMC/SD Date: Thu, 5 Nov 2015 16:01:32 +0100 Message-Id: <1446735693-11542-1-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=unavailable 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 MMC_CAP_RUNTIME_RESUME was invented to decrease system PM resume time for systems that particularly needs this. As the feature has matured let's make it the default behavior for MMC/SD. Signed-off-by: Ulf Hansson --- drivers/mmc/core/mmc.c | 15 ++------------- drivers/mmc/core/sd.c | 15 ++------------- 2 files changed, 4 insertions(+), 26 deletions(-) diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index c793fda..392fa8c 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -1862,16 +1862,8 @@ static int mmc_shutdown(struct mmc_host *host) */ static int mmc_resume(struct mmc_host *host) { - int err = 0; - - if (!(host->caps & MMC_CAP_RUNTIME_RESUME)) { - err = _mmc_resume(host); - pm_runtime_set_active(&host->card->dev); - pm_runtime_mark_last_busy(&host->card->dev); - } pm_runtime_enable(&host->card->dev); - - return err; + return 0; } /* @@ -1899,12 +1891,9 @@ static int mmc_runtime_resume(struct mmc_host *host) { int err; - if (!(host->caps & (MMC_CAP_AGGRESSIVE_PM | MMC_CAP_RUNTIME_RESUME))) - return 0; - err = _mmc_resume(host); if (err) - pr_err("%s: error %d doing aggressive resume\n", + pr_err("%s: error %d doing runtime resume\n", mmc_hostname(host), err); return 0; diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c index 141eaa9..8f3b46a 100644 --- a/drivers/mmc/core/sd.c +++ b/drivers/mmc/core/sd.c @@ -1128,16 +1128,8 @@ out: */ static int mmc_sd_resume(struct mmc_host *host) { - int err = 0; - - if (!(host->caps & MMC_CAP_RUNTIME_RESUME)) { - err = _mmc_sd_resume(host); - pm_runtime_set_active(&host->card->dev); - pm_runtime_mark_last_busy(&host->card->dev); - } pm_runtime_enable(&host->card->dev); - - return err; + return 0; } /* @@ -1165,12 +1157,9 @@ static int mmc_sd_runtime_resume(struct mmc_host *host) { int err; - if (!(host->caps & (MMC_CAP_AGGRESSIVE_PM | MMC_CAP_RUNTIME_RESUME))) - return 0; - err = _mmc_sd_resume(host); if (err) - pr_err("%s: error %d doing aggressive resume\n", + pr_err("%s: error %d doing runtime resume\n", mmc_hostname(host), err); return 0;