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: 2948791 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2DE209F288 for ; Thu, 26 Sep 2013 14:57:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8609F202AB for ; Thu, 26 Sep 2013 14:57:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 15A4D201EA for ; Thu, 26 Sep 2013 14:57:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751444Ab3IZO5v (ORCPT ); Thu, 26 Sep 2013 10:57:51 -0400 Received: from mail-ea0-f181.google.com ([209.85.215.181]:57695 "EHLO mail-ea0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753157Ab3IZO4O (ORCPT ); Thu, 26 Sep 2013 10:56:14 -0400 Received: by mail-ea0-f181.google.com with SMTP id d10so607909eaj.40 for ; Thu, 26 Sep 2013 07:56:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=w14qvGqFFmky3Y2L20dXKv/mab38Mb5Bh7fDejIcBKk=; b=HZE9QXgHglXKGdHjDJCsSB6gfV32/D+py/+d6DMlEkP89mKyGedvTRwMCr2yU6n74L dZXjrAbwWErGKNUVc6kv2N+TDBzkXwKH2Iby+pnChCbP+tcEPSUOZ7qfvAx5Z9R1SE+B Ze8ayg0ulBbXbFOI0Qq+Xp1MRxa8XVxVLUe5gBRm5CwHb8upsMWI1GcArYXxxCcLOuY9 RpB2MjwWBvA4xoLE+mM2EZn1FFchspD4GJgjdwXkg2fIR+C6+xNTgXoVIDYX3aMcczSe 8Jn2u4MdEdGy/okZroeNB4kkY/0THAMApO/SSNPF/TQNHDW9I5Ev2sppb82+EjuzIkPk a+Xg== X-Gm-Message-State: ALoCoQmnY5vQGQaFEKHbNDhafiBc5griSfa47ZVvwKgLIYDdI11HJ9inL8cleSb2nJlZAY1HSr/g 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> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-9.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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);