From patchwork Thu Sep 26 14:54:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 20625 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 4C9AB24687 for ; Thu, 26 Sep 2013 14:56:45 +0000 (UTC) Received: by mail-ye0-f197.google.com with SMTP id q5sf1033571yen.8 for ; Thu, 26 Sep 2013 07:56:45 -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=w14qvGqFFmky3Y2L20dXKv/mab38Mb5Bh7fDejIcBKk=; b=bt8mk8ZHAjP4zmJdUc9FjR7osDmOiYZPcHZXInWUhY7AQRL/LmBPmfBaO1QAcWwlrz WYB063KLYDHmYLkcNaUY5wKc76t45fm6ZHgC19MRiz5XLjzuGhUU3O8AlzA9Nlhr7k04 UNQdTYh2cH9jXP/85fD836pqOuxEkESMo91YFTivkGHgg9z0VV4PIzFV70mUvJJb/aHn 3et3Zo8NOlCpuK6CUudONOuWD3cZ997T4Np4iAJR6AOvESQIAK69TiFNCvypvZrd8rVe lGQHQIhbMm4He06SPpAHWGSdKyd31bmXP81R/YOi114cXI04Myq2jz7HxC5Y+ajTGF0K GMeg== X-Gm-Message-State: ALoCoQkWYFIslNaaxtrNgbXej7WSrLF9cMz30LBrKjQNEpSNW/MStFJH1y7dduqCp1+OfN2DT58i X-Received: by 10.236.135.79 with SMTP id t55mr252223yhi.39.1380207405086; Thu, 26 Sep 2013 07:56:45 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.0.116 with SMTP id 20ls947094qed.34.gmail; Thu, 26 Sep 2013 07:56:45 -0700 (PDT) X-Received: by 10.52.33.98 with SMTP id q2mr116520vdi.50.1380207404987; Thu, 26 Sep 2013 07:56:44 -0700 (PDT) Received: from mail-ve0-f176.google.com (mail-ve0-f176.google.com [209.85.128.176]) by mx.google.com with ESMTPS id zw10si498334vdb.70.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 07:56:44 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.176 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.176; Received: by mail-ve0-f176.google.com with SMTP id jx11so983638veb.7 for ; Thu, 26 Sep 2013 07:56:14 -0700 (PDT) X-Received: by 10.58.196.148 with SMTP id im20mr1019996vec.28.1380207374896; Thu, 26 Sep 2013 07:56:14 -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 u4csp371149vcz; Thu, 26 Sep 2013 07:56:14 -0700 (PDT) X-Received: by 10.14.107.68 with SMTP id n44mr2016297eeg.26.1380207373655; Thu, 26 Sep 2013 07:56:13 -0700 (PDT) Received: from mail-ee0-f52.google.com (mail-ee0-f52.google.com [74.125.83.52]) by mx.google.com with ESMTPS id x42si1850720eel.206.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 07:56:13 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.83.52 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=74.125.83.52; Received: by mail-ee0-f52.google.com with SMTP id c41so603381eek.25 for ; Thu, 26 Sep 2013 07:56:13 -0700 (PDT) X-Received: by 10.14.216.201 with SMTP id g49mr1855706eep.77.1380207373142; Thu, 26 Sep 2013 07:56:13 -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:12 -0700 (PDT) From: Ulf Hansson To: linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, Chris Ball Cc: Ulf Hansson , Guennadi Liakhovetski , Ian Molton Subject: [PATCH 24/27] mmc: tmio: Move away from using deprecated APIs Date: Thu, 26 Sep 2013 16:54:49 +0200 Message-Id: <1380207292-16968-25-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.176 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: Guennadi Liakhovetski Cc: Ian Molton Signed-off-by: Ulf Hansson --- drivers/mmc/host/tmio_mmc_pio.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c index b380225..f3b2d8c 100644 --- a/drivers/mmc/host/tmio_mmc_pio.c +++ b/drivers/mmc/host/tmio_mmc_pio.c @@ -1145,12 +1145,9 @@ int tmio_mmc_host_suspend(struct device *dev) { struct mmc_host *mmc = dev_get_drvdata(dev); struct tmio_mmc_host *host = mmc_priv(mmc); - int ret = mmc_suspend_host(mmc); - if (!ret) - tmio_mmc_disable_mmc_irqs(host, TMIO_MASK_ALL); - - return ret; + tmio_mmc_disable_mmc_irqs(host, TMIO_MASK_ALL); + return 0; } EXPORT_SYMBOL(tmio_mmc_host_suspend); @@ -1163,7 +1160,7 @@ int tmio_mmc_host_resume(struct device *dev) /* The MMC core will perform the complete set up */ host->resuming = true; - return mmc_resume_host(mmc); + return 0; } EXPORT_SYMBOL(tmio_mmc_host_resume);