From patchwork Thu Sep 26 14:54:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 20627 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vb0-f71.google.com (mail-vb0-f71.google.com [209.85.212.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2DB7F24687 for ; Thu, 26 Sep 2013 14:56:51 +0000 (UTC) Received: by mail-vb0-f71.google.com with SMTP id g17sf1073288vbg.2 for ; Thu, 26 Sep 2013 07:56:51 -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=/8C+Dj1ij2r8Vezloz2ZI3kpIEMyxUd+Rxt1r03Baig=; b=SawCgpsZSDcnVqPj11zi3zqDQDLAimDCCHGnCpYAEQiuf0EGA+8obe5Ip+wjnXAnTS 28hcEcIUZHnAjavgASo/j9NuUQ0ir1XXwgowrbrbnGGhL+7cO/Ef7LIUa/nUiP7aarzd 5Qrep2aKEG1CTGPzisGIPLhmNQ94bhtgBN+wZAHwZv0Grdf2QFCzyQHtmkfza8Y1dSK6 +xIgjiLD2ajgDWUqfhazWHUxxbgELNWuVICLKyCrF1s4s8CAr+Ur7apgkrWz2N3eSGic 0U/naviOaaHQ9wk6BOnn8bA7npArsL0fa5VaOp4MW6X3zLNLQlxJhkCXmQSYYvUPhdVq FMPw== X-Gm-Message-State: ALoCoQmg5b1eMOHOS+sr5yXYHaiLRJ+M/O2b4VHgH1psBHp44wJQn+Spj5PstxhzM+IcXZNwRw4J X-Received: by 10.236.111.73 with SMTP id v49mr257635yhg.46.1380207411004; Thu, 26 Sep 2013 07:56:51 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.24.144 with SMTP id u16ls1002913qef.84.gmail; Thu, 26 Sep 2013 07:56:50 -0700 (PDT) X-Received: by 10.58.235.193 with SMTP id uo1mr1058757vec.6.1380207410908; Thu, 26 Sep 2013 07:56:50 -0700 (PDT) Received: from mail-vb0-f48.google.com (mail-vb0-f48.google.com [209.85.212.48]) by mx.google.com with ESMTPS id fx15si492841vec.110.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 07:56:50 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.48 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.48; Received: by mail-vb0-f48.google.com with SMTP id w16so910220vbf.21 for ; Thu, 26 Sep 2013 07:56:20 -0700 (PDT) X-Received: by 10.221.64.17 with SMTP id xg17mr1011692vcb.5.1380207380805; Thu, 26 Sep 2013 07:56:20 -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 u4csp371157vcz; Thu, 26 Sep 2013 07:56:20 -0700 (PDT) X-Received: by 10.15.100.198 with SMTP id bn46mr1863497eeb.11.1380207379879; Thu, 26 Sep 2013 07:56:19 -0700 (PDT) Received: from mail-ee0-f42.google.com (mail-ee0-f42.google.com [74.125.83.42]) by mx.google.com with ESMTPS id e49si1814053eep.351.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 07:56:19 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.83.42 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=74.125.83.42; Received: by mail-ee0-f42.google.com with SMTP id b45so612029eek.15 for ; Thu, 26 Sep 2013 07:56:19 -0700 (PDT) X-Received: by 10.14.100.138 with SMTP id z10mr1967072eef.74.1380207379378; Thu, 26 Sep 2013 07:56:19 -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:56:18 -0700 (PDT) From: Ulf Hansson To: linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, Chris Ball Cc: Ulf Hansson , Russell King Subject: [PATCH 26/27] mmc: mmci: Move away from using deprecated APIs Date: Thu, 26 Sep 2013 16:54:51 +0200 Message-Id: <1380207292-16968-27-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.48 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: Russell King Signed-off-by: Ulf Hansson --- drivers/mmc/host/mmci.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index c3785ed..9e8a482 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -1725,37 +1725,28 @@ static int mmci_suspend(struct device *dev) { struct amba_device *adev = to_amba_device(dev); struct mmc_host *mmc = amba_get_drvdata(adev); - int ret = 0; if (mmc) { struct mmci_host *host = mmc_priv(mmc); - - ret = mmc_suspend_host(mmc); - if (ret == 0) { - pm_runtime_get_sync(dev); - writel(0, host->base + MMCIMASK0); - } + pm_runtime_get_sync(dev); + writel(0, host->base + MMCIMASK0); } - return ret; + return 0; } static int mmci_resume(struct device *dev) { struct amba_device *adev = to_amba_device(dev); struct mmc_host *mmc = amba_get_drvdata(adev); - int ret = 0; if (mmc) { struct mmci_host *host = mmc_priv(mmc); - writel(MCI_IRQENABLE, host->base + MMCIMASK0); pm_runtime_put(dev); - - ret = mmc_resume_host(mmc); } - return ret; + return 0; } #endif