From patchwork Thu Sep 26 14:54:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 2948701 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 12EC5BFF0B for ; Thu, 26 Sep 2013 14:56:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 05CBE201FF for ; Thu, 26 Sep 2013 14:56:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5648A201D5 for ; Thu, 26 Sep 2013 14:56:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752630Ab3IZO4N (ORCPT ); Thu, 26 Sep 2013 10:56:13 -0400 Received: from mail-ee0-f43.google.com ([74.125.83.43]:37702 "EHLO mail-ee0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753157Ab3IZO4I (ORCPT ); Thu, 26 Sep 2013 10:56:08 -0400 Received: by mail-ee0-f43.google.com with SMTP id e52so611126eek.16 for ; Thu, 26 Sep 2013 07:56:07 -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=1mIcd8DqPyN0EgXswtO7a38Z7t1oqrfS3/6Heh125t4=; b=Af88RfexwTmuunnwAqmOPZZQxY3DDljPMzSdqVQQaiJig2b5XM45K5pLXRiJoO5LD0 tVZNurHmHbEyTVSnlDckkN/V70MVx5zkbbmwYhv3As+PvFoTnOuvXz4fOzBbsaS4xvxH tXH0iAWLXDFuOm/m8x74ukpB0BtPnorp7NK+NCBLoEiGSGKr5z3Ywo9UsbrS5QDyY9Fa TY5ACGsEditzlP8bPKIwUl5DwtLH7B7MghHdtNHinaMnCiQD9MCoO4Rk6UuR7pi30SG9 LootTKl6NGUaeJ/m8kJOOVaWeydW9lxSGm5xQGtALjdFWbL5LAl6rUuwd2SNGUYLnA2y O6iw== X-Gm-Message-State: ALoCoQlDgWlG4ho8FkkWRB7JWkanT//nB/dx8JfLsk2wFbvn9JnHQ9sYNVA86iE6W6n4h6tqlEq5 X-Received: by 10.14.211.4 with SMTP id v4mr1847399eeo.81.1380207367143; Thu, 26 Sep 2013 07:56:07 -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:06 -0700 (PDT) From: Ulf Hansson To: linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, Chris Ball Cc: Ulf Hansson , Sascha Sommer Subject: [PATCH 22/27] mmc: sdricoh_cs: Move away from using deprecated APIs Date: Thu, 26 Sep 2013 16:54:47 +0200 Message-Id: <1380207292-16968-23-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: Sascha Sommer Signed-off-by: Ulf Hansson Acked-by: Sascha Sommer --- drivers/mmc/host/sdricoh_cs.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/mmc/host/sdricoh_cs.c b/drivers/mmc/host/sdricoh_cs.c index 50adbd1..b7e3057 100644 --- a/drivers/mmc/host/sdricoh_cs.c +++ b/drivers/mmc/host/sdricoh_cs.c @@ -516,9 +516,7 @@ static void sdricoh_pcmcia_detach(struct pcmcia_device *link) #ifdef CONFIG_PM static int sdricoh_pcmcia_suspend(struct pcmcia_device *link) { - struct mmc_host *mmc = link->priv; dev_dbg(&link->dev, "suspend\n"); - mmc_suspend_host(mmc); return 0; } @@ -527,7 +525,6 @@ static int sdricoh_pcmcia_resume(struct pcmcia_device *link) struct mmc_host *mmc = link->priv; dev_dbg(&link->dev, "resume\n"); sdricoh_reset(mmc_priv(mmc)); - mmc_resume_host(mmc); return 0; } #else