From patchwork Thu Sep 26 14:54:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 20607 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 C4E9A24687 for ; Thu, 26 Sep 2013 14:55:53 +0000 (UTC) Received: by mail-ye0-f197.google.com with SMTP id q5sf1031109yen.4 for ; Thu, 26 Sep 2013 07:55:53 -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=olrXnjJseMsNwKPLX1H0By3qTL3qvDWLCKVZ7qIFNOc=; b=A+eMhM9kmc3wtwJcUMxt9gvnX+nP6TSazwKqx4L/k2QuQvlZuIPR2DSapOhIm58ov0 qlfXt2D8Rnfl0GuVNFSyLXd90yy68hb6zstxFBFxBh/dKrikKQVivn6dXfx0Mvo8EyOb wIm8xzfPZO154Fr9+CFDkvLtnK5NCtkchagSiCJqNU0fsHgnEuDn/0b+3WHocdUNL2WF Vign2miuw9+q2yJGD3bsfYfeYs72JPr5Qy/ZSA58Fxj2e0ur99o7xZrhMm8hO8+adEpx kVtrZGBwNpBiXDHzS032vOHNOjbfGJDR1coVohfM+dTBmVv5in30xIPhaXijFKNxqp4w Aciw== X-Gm-Message-State: ALoCoQm0dRXTmxZB2CDIujwuNIHO0qK1YJVjhBmpGvAjEBpchuWeZjdyH8WxqUSnOqCgZccSFyuD X-Received: by 10.236.13.36 with SMTP id a24mr260331yha.50.1380207353594; Thu, 26 Sep 2013 07:55:53 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.86.161 with SMTP id q1ls907464qez.13.gmail; Thu, 26 Sep 2013 07:55:53 -0700 (PDT) X-Received: by 10.52.37.69 with SMTP id w5mr847628vdj.32.1380207353449; Thu, 26 Sep 2013 07:55:53 -0700 (PDT) Received: from mail-ve0-f178.google.com (mail-ve0-f178.google.com [209.85.128.178]) by mx.google.com with ESMTPS id o5si488904vdw.128.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 07:55:53 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.178 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.178; Received: by mail-ve0-f178.google.com with SMTP id jw12so1014607veb.9 for ; Thu, 26 Sep 2013 07:55:23 -0700 (PDT) X-Received: by 10.52.116.145 with SMTP id jw17mr65941vdb.54.1380207323337; Thu, 26 Sep 2013 07:55:23 -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 u4csp371093vcz; Thu, 26 Sep 2013 07:55:22 -0700 (PDT) X-Received: by 10.15.43.206 with SMTP id x54mr1824539eev.79.1380207322419; Thu, 26 Sep 2013 07:55:22 -0700 (PDT) Received: from mail-ea0-f174.google.com (mail-ea0-f174.google.com [209.85.215.174]) by mx.google.com with ESMTPS id h5si1878578eeg.80.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 07:55:22 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.215.174 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=209.85.215.174; Received: by mail-ea0-f174.google.com with SMTP id z15so606694ead.5 for ; Thu, 26 Sep 2013 07:55:22 -0700 (PDT) X-Received: by 10.14.104.199 with SMTP id i47mr830455eeg.85.1380207321853; Thu, 26 Sep 2013 07:55:21 -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:20 -0700 (PDT) From: Ulf Hansson To: linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, Chris Ball Cc: Ulf Hansson , Seungwon Jeon , Jaehoon Chung Subject: [PATCH 06/27] mmc: dw_mmc: Move away from using deprecated APIs Date: Thu, 26 Sep 2013 16:54:31 +0200 Message-Id: <1380207292-16968-7-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.128.178 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: Seungwon Jeon Cc: Jaehoon Chung Signed-off-by: Ulf Hansson --- drivers/mmc/host/dw_mmc.c | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 0a6a512..4bce0de 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -2696,23 +2696,6 @@ EXPORT_SYMBOL(dw_mci_remove); */ int dw_mci_suspend(struct dw_mci *host) { - int i, ret = 0; - - for (i = 0; i < host->num_slots; i++) { - struct dw_mci_slot *slot = host->slot[i]; - if (!slot) - continue; - ret = mmc_suspend_host(slot->mmc); - if (ret < 0) { - while (--i >= 0) { - slot = host->slot[i]; - if (slot) - mmc_resume_host(host->slot[i]->mmc); - } - return ret; - } - } - if (host->vmmc) regulator_disable(host->vmmc); @@ -2765,10 +2748,6 @@ int dw_mci_resume(struct dw_mci *host) dw_mci_set_ios(slot->mmc, &slot->mmc->ios); dw_mci_setup_bus(slot, true); } - - ret = mmc_resume_host(host->slot[i]->mmc); - if (ret < 0) - return ret; } return 0; }