From patchwork Thu Sep 26 14:54:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 20617 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ye0-f197.google.com (mail-ye0-f197.google.com [209.85.213.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6C7AF24687 for ; Thu, 26 Sep 2013 14:56:22 +0000 (UTC) Received: by mail-ye0-f197.google.com with SMTP id q5sf1033071yen.8 for ; Thu, 26 Sep 2013 07:56:22 -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=BCH9xYdCLEb+tPJSxXVsnUgk24H8VwYszuONgBA8slI=; b=c9JWFWX//R4gZ/m5Xfiwmw4dkIoFlwsL0+qr7ltNz77BPFt9Jqxk7jrrVIANs26z93 qpFgGVWK8Bru5Dl7AbhZy8jgmEdh8jdlGPPPtyrAqOC8/WcQ6XMhWxqCGcRR2ixdNdxE PejIozhJj8XaDu2ERTuJwobZQesR4MQvfKOhfd2wWyVafr+Ei7V+pYws0xr9zeoPfWYt TORoDvlfmyE7yTIEDwOI1gz0ytLgebwCpcMuyIZuVJjEhvsuZiUq/2GSiv+j9zL3gBEx AJ4o9JKAp3wpLPNGBu9QXoVwKPMFhYkUAmucCaJIs5WKhSeUkEai1UyuXPges613G24Q 8NvA== X-Gm-Message-State: ALoCoQnsfKb9A+7rtpLskOpfpgokzKlX0poZUxr7AWl5/bsnfT1My6aBU9we1rKugg9Smg4wlXFA X-Received: by 10.236.54.68 with SMTP id h44mr238984yhc.21.1380207382219; Thu, 26 Sep 2013 07:56:22 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.0.116 with SMTP id 20ls946821qed.34.gmail; Thu, 26 Sep 2013 07:56:22 -0700 (PDT) X-Received: by 10.220.15.132 with SMTP id k4mr76867vca.45.1380207382134; Thu, 26 Sep 2013 07:56:22 -0700 (PDT) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id ur9si496698veb.79.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 07:56:22 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.170 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.170; Received: by mail-vc0-f170.google.com with SMTP id lc6so621524vcb.1 for ; Thu, 26 Sep 2013 07:55:52 -0700 (PDT) X-Received: by 10.52.116.74 with SMTP id ju10mr880818vdb.20.1380207352032; Thu, 26 Sep 2013 07:55:52 -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 u4csp371117vcz; Thu, 26 Sep 2013 07:55:51 -0700 (PDT) X-Received: by 10.15.48.197 with SMTP id h45mr2018735eew.0.1380207351034; Thu, 26 Sep 2013 07:55:51 -0700 (PDT) Received: from mail-ee0-f43.google.com (mail-ee0-f43.google.com [74.125.83.43]) by mx.google.com with ESMTPS id t9si1883581eeo.65.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 07:55:51 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.83.43 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=74.125.83.43; Received: by mail-ee0-f43.google.com with SMTP id e52so603783eek.2 for ; Thu, 26 Sep 2013 07:55:50 -0700 (PDT) X-Received: by 10.14.100.138 with SMTP id z10mr1963807eef.74.1380207350536; Thu, 26 Sep 2013 07:55:50 -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:49 -0700 (PDT) From: Ulf Hansson To: linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, Chris Ball Cc: Ulf Hansson , Sascha Hauer , Anatolij Gustschin Subject: [PATCH 16/27] mmc: mxcmmc: Move away from using deprecated APIs Date: Thu, 26 Sep 2013 16:54:41 +0200 Message-Id: <1380207292-16968-17-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.170 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. Cc: Sascha Hauer Cc: Anatolij Gustschin Signed-off-by: Ulf Hansson --- drivers/mmc/host/mxcmmc.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c index c174c6a..f7199c8 100644 --- a/drivers/mmc/host/mxcmmc.c +++ b/drivers/mmc/host/mxcmmc.c @@ -1250,28 +1250,20 @@ static int mxcmci_suspend(struct device *dev) { struct mmc_host *mmc = dev_get_drvdata(dev); struct mxcmci_host *host = mmc_priv(mmc); - int ret = 0; - if (mmc) - ret = mmc_suspend_host(mmc); clk_disable_unprepare(host->clk_per); clk_disable_unprepare(host->clk_ipg); - - return ret; + return 0; } static int mxcmci_resume(struct device *dev) { struct mmc_host *mmc = dev_get_drvdata(dev); struct mxcmci_host *host = mmc_priv(mmc); - int ret = 0; clk_prepare_enable(host->clk_per); clk_prepare_enable(host->clk_ipg); - if (mmc) - ret = mmc_resume_host(mmc); - - return ret; + return 0; } static const struct dev_pm_ops mxcmci_pm_ops = {