From patchwork Thu Sep 26 14:54:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 20616 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qe0-f72.google.com (mail-qe0-f72.google.com [209.85.128.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 91A0E24687 for ; Thu, 26 Sep 2013 14:56:20 +0000 (UTC) Received: by mail-qe0-f72.google.com with SMTP id 6sf1088750qea.7 for ; Thu, 26 Sep 2013 07:56:20 -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=69RQFEzbV7kL2e0MYA3Ns5jots66Ywp3tnJee3nvES0=; b=eDEbHBOZAgQMpk7XLCJNICb2ajgyKlkFSQCuOGDoaE6Pemczg/K5ZP2GTY8Kdm/wsV BxJjjAlVXvgqh1wXFjuxImo/ZLlVW0SE8fLUIlyCsoxfrjpiaUY4+lk+WqWgXp+wbzYQ loCVQ9SSuPVUKtpNUdgnHMR6jzYQvB40oLBnuiCx200ggyu7lvb6mk7kn8DTzwdM33zc BQlmk+Tp1I7amwHiUnbQfFBHr1Np6nxPcQPEwdjKvAakIi02iEJoApZuv/udXu4tqlgT h5ceM53WGbq0sJh0KOv9fwGWh5TeiS+tLCQWhZF8LuUafHiDnLCzFhGDiHh0NHbdT305 gCoA== X-Gm-Message-State: ALoCoQlsbeyqL54PIZXTtiwL7lG2RHGYDBm6hXfmp9durzhxZjFVc6RMOjSCxnAv9d7bWtxO0j// X-Received: by 10.236.94.205 with SMTP id n53mr255272yhf.44.1380207380138; Thu, 26 Sep 2013 07:56:20 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.99.106 with SMTP id ep10ls913939qeb.59.gmail; Thu, 26 Sep 2013 07:56:20 -0700 (PDT) X-Received: by 10.220.94.206 with SMTP id a14mr1008075vcn.19.1380207380027; Thu, 26 Sep 2013 07:56:20 -0700 (PDT) Received: from mail-vb0-f52.google.com (mail-vb0-f52.google.com [209.85.212.52]) by mx.google.com with ESMTPS id st7si505609vdc.16.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 07:56:20 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.52 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.52; Received: by mail-vb0-f52.google.com with SMTP id f12so931377vbg.11 for ; Thu, 26 Sep 2013 07:55:49 -0700 (PDT) X-Received: by 10.58.28.147 with SMTP id b19mr972975veh.27.1380207349607; Thu, 26 Sep 2013 07:55:49 -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 u4csp371115vcz; Thu, 26 Sep 2013 07:55:49 -0700 (PDT) X-Received: by 10.14.211.4 with SMTP id v4mr1845287eeo.81.1380207348654; Thu, 26 Sep 2013 07:55:48 -0700 (PDT) Received: from mail-ea0-f169.google.com (mail-ea0-f169.google.com [209.85.215.169]) by mx.google.com with ESMTPS id x7si1846559eeo.217.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 07:55:48 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.215.169 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=209.85.215.169; Received: by mail-ea0-f169.google.com with SMTP id k11so608743eaj.14 for ; Thu, 26 Sep 2013 07:55:48 -0700 (PDT) X-Received: by 10.14.126.69 with SMTP id a45mr1831093eei.65.1380207348117; Thu, 26 Sep 2013 07:55:48 -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:47 -0700 (PDT) From: Ulf Hansson To: linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, Chris Ball Cc: Ulf Hansson , Shawn Guo , Fabio Estevam Subject: [PATCH 15/27] mmc: mxs-mmc: Move away from using deprecated APIs Date: Thu, 26 Sep 2013 16:54:40 +0200 Message-Id: <1380207292-16968-16-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.212.52 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: Shawn Guo Cc: Fabio Estevam Signed-off-by: Ulf Hansson --- drivers/mmc/host/mxs-mmc.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c index e1fa3ef..50fc9df 100644 --- a/drivers/mmc/host/mxs-mmc.c +++ b/drivers/mmc/host/mxs-mmc.c @@ -724,13 +724,9 @@ static int mxs_mmc_suspend(struct device *dev) struct mmc_host *mmc = dev_get_drvdata(dev); struct mxs_mmc_host *host = mmc_priv(mmc); struct mxs_ssp *ssp = &host->ssp; - int ret = 0; - - ret = mmc_suspend_host(mmc); clk_disable_unprepare(ssp->clk); - - return ret; + return 0; } static int mxs_mmc_resume(struct device *dev) @@ -738,13 +734,9 @@ static int mxs_mmc_resume(struct device *dev) struct mmc_host *mmc = dev_get_drvdata(dev); struct mxs_mmc_host *host = mmc_priv(mmc); struct mxs_ssp *ssp = &host->ssp; - int ret = 0; clk_prepare_enable(ssp->clk); - - ret = mmc_resume_host(mmc); - - return ret; + return 0; } static const struct dev_pm_ops mxs_mmc_pm_ops = {