From patchwork Thu Sep 26 14:54:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 20612 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f199.google.com (mail-qc0-f199.google.com [209.85.216.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2682A24687 for ; Thu, 26 Sep 2013 14:56:08 +0000 (UTC) Received: by mail-qc0-f199.google.com with SMTP id u18sf1071502qcx.10 for ; Thu, 26 Sep 2013 07:56:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=o4/xp+7JWGLhj2XBi+xoa7zRBTCN/OltCh5ngQPt5/w=; b=HH6nJ4QzD40Q5tMCGpYMPoaV9rKCvWq6KJfzFAKTYQ0VSZkV4jvIdcvLJLgLbPvezg rZgBJoZZ7Yh0h0AEAPvcLGeYLP22FMS8WKk/BCgFCX0nL84DjflWrehZZ7FIn+658srq rj2UX4pjSXcTxYPm7FVhxuTy/U2aXZykmv+7uGZhTMO1OytzHRETnYx+hvr0CWJI4uIL sb65EXCgk9m6Xim/cxGzVKDZpiDkq+JWR6ZhHWxtYSAeynY8Z6999IFIEDkiftrFnIJ2 QmZVEpke7eiZmRkagy5RyDs81tlY8HMcZFTAvTAlYsvdN/SWuITK4oJ2F3zLWt7mumDU OoOA== X-Gm-Message-State: ALoCoQlVX0Ij0HRi6HciWsL4KtQclNYYHZYqIAncA83p0iT232ErrfhcZ3SRh5AUzdpFUN5JFRk0 X-Received: by 10.236.51.9 with SMTP id a9mr256727yhc.41.1380207367978; Thu, 26 Sep 2013 07:56:07 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.1.65 with SMTP id 1ls882312qek.72.gmail; Thu, 26 Sep 2013 07:56:07 -0700 (PDT) X-Received: by 10.52.32.37 with SMTP id f5mr837448vdi.17.1380207367860; Thu, 26 Sep 2013 07:56:07 -0700 (PDT) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by mx.google.com with ESMTPS id wp10si501048vdb.45.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 07:56:07 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.173 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.173; Received: by mail-vc0-f173.google.com with SMTP id if17so915417vcb.18 for ; Thu, 26 Sep 2013 07:55:37 -0700 (PDT) X-Received: by 10.221.32.133 with SMTP id sk5mr1005899vcb.27.1380207337712; Thu, 26 Sep 2013 07:55:37 -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.220.174.196 with SMTP id u4csp371099vcz; Thu, 26 Sep 2013 07:55:37 -0700 (PDT) X-Received: by 10.14.198.197 with SMTP id v45mr1976246een.52.1380207336662; Thu, 26 Sep 2013 07:55:36 -0700 (PDT) Received: from mail-ea0-f173.google.com (mail-ea0-f173.google.com [209.85.215.173]) by mx.google.com with ESMTPS id x42si1861603eel.146.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 07:55:36 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.215.173 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=209.85.215.173; Received: by mail-ea0-f173.google.com with SMTP id g10so612258eak.32 for ; Thu, 26 Sep 2013 07:55:36 -0700 (PDT) X-Received: by 10.15.44.199 with SMTP id z47mr1933017eev.64.1380207336128; Thu, 26 Sep 2013 07:55:36 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id x47sm4813555eea.16.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 07:55:35 -0700 (PDT) From: Ulf Hansson To: linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, Chris Ball Cc: Ulf Hansson Subject: [PATCH 11/27] mmc: sdhci: Move away from using deprecated APIs Date: Thu, 26 Sep 2013 16:54:36 +0200 Message-Id: <1380207292-16968-12-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1380207292-16968-1-git-send-email-ulf.hansson@linaro.org> References: <1380207292-16968-1-git-send-email-ulf.hansson@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ulf.hansson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.173 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 and resume of cards are being handled from the protocol layer and consequently the mmc_suspend|resume_host APIs are deprecated. This means we can simplify the suspend|resume callbacks by removing the use of the deprecated APIs. Signed-off-by: Ulf Hansson --- drivers/mmc/host/sdhci.c | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 7a7fb4f..bdb7598 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -2546,8 +2546,6 @@ EXPORT_SYMBOL_GPL(sdhci_disable_irq_wakeups); int sdhci_suspend_host(struct sdhci_host *host) { - int ret; - if (host->ops->platform_suspend) host->ops->platform_suspend(host); @@ -2559,19 +2557,6 @@ int sdhci_suspend_host(struct sdhci_host *host) host->flags &= ~SDHCI_NEEDS_RETUNING; } - ret = mmc_suspend_host(host->mmc); - if (ret) { - if (host->flags & SDHCI_USING_RETUNING_TIMER) { - host->flags |= SDHCI_NEEDS_RETUNING; - mod_timer(&host->tuning_timer, jiffies + - host->tuning_count * HZ); - } - - sdhci_enable_card_detection(host); - - return ret; - } - if (!device_may_wakeup(mmc_dev(host->mmc))) { sdhci_mask_irqs(host, SDHCI_INT_ALL_MASK); free_irq(host->irq, host); @@ -2579,14 +2564,14 @@ int sdhci_suspend_host(struct sdhci_host *host) sdhci_enable_irq_wakeups(host); enable_irq_wake(host->irq); } - return ret; + return 0; } EXPORT_SYMBOL_GPL(sdhci_suspend_host); int sdhci_resume_host(struct sdhci_host *host) { - int ret; + int ret = 0; if (host->flags & (SDHCI_USE_SDMA | SDHCI_USE_ADMA)) { if (host->ops->enable_dma) @@ -2615,7 +2600,6 @@ int sdhci_resume_host(struct sdhci_host *host) mmiowb(); } - ret = mmc_resume_host(host->mmc); sdhci_enable_card_detection(host); if (host->ops->platform_resume)