From patchwork Thu Sep 26 14:54:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 2948931 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 136CD9F288 for ; Thu, 26 Sep 2013 15:00:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C923B202E6 for ; Thu, 26 Sep 2013 15:00:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 76447202AB for ; Thu, 26 Sep 2013 15:00:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753411Ab3IZPAJ (ORCPT ); Thu, 26 Sep 2013 11:00:09 -0400 Received: from mail-ea0-f179.google.com ([209.85.215.179]:57161 "EHLO mail-ea0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753059Ab3IZOzv (ORCPT ); Thu, 26 Sep 2013 10:55:51 -0400 Received: by mail-ea0-f179.google.com with SMTP id b10so617417eae.10 for ; Thu, 26 Sep 2013 07:55:50 -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=BCH9xYdCLEb+tPJSxXVsnUgk24H8VwYszuONgBA8slI=; b=dsl9dHbRvH6f/JCP+KWm6U6A2240Cd55Kb5yS764MiHbI+9h6jym9WNzSL9sEw8ioT A2an5GBu2mW5GN1qJznUBE94Qlz7U61elw2Q5beZn1T7mE/EWzS4pncrE/4SqL+wvn/5 dbduzDD+uAQM6kPcscYaZzweyCK9Tacj0+x8pI2uQtzvBOjWRmS0nc7n2L/F5vAfwKS4 G61Xc5q8FjCK9Rj4rQl6UrIRdwzgnrW2yzr8cFm/YJTueARIy/hjuRsi4vwLp7o0/CFR Elq2Lv4QKw/Jc2sn7FBFRo5FJVfJQBqumpo8BA4t6DMY97GWt2e60zo1Dg3F8pu3mlAW 6GQg== X-Gm-Message-State: ALoCoQlKEqCuDOUG/onf6DHzIkBcLnljdGj9IEEbEeE6cSdsI/egqgPb902Bn6afrkaQe8kuV2+6 X-Received: by 10.14.100.138 with SMTP id z10mr1963807eef.74.1380207350536; Thu, 26 Sep 2013 07:55:50 -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:49 -0700 (PDT) From: Ulf Hansson To: linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, Chris Ball Cc: Ulf Hansson , Sascha Hauer , Anatolij Gustschin Subject: [PATCH 16/27] mmc: mxcmmc: Move away from using deprecated APIs Date: Thu, 26 Sep 2013 16:54:41 +0200 Message-Id: <1380207292-16968-17-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 Hauer Cc: Anatolij Gustschin Signed-off-by: Ulf Hansson Acked-by: Sascha Hauer --- drivers/mmc/host/mxcmmc.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c index c174c6a..f7199c8 100644 --- a/drivers/mmc/host/mxcmmc.c +++ b/drivers/mmc/host/mxcmmc.c @@ -1250,28 +1250,20 @@ static int mxcmci_suspend(struct device *dev) { struct mmc_host *mmc = dev_get_drvdata(dev); struct mxcmci_host *host = mmc_priv(mmc); - int ret = 0; - if (mmc) - ret = mmc_suspend_host(mmc); clk_disable_unprepare(host->clk_per); clk_disable_unprepare(host->clk_ipg); - - return ret; + return 0; } static int mxcmci_resume(struct device *dev) { struct mmc_host *mmc = dev_get_drvdata(dev); struct mxcmci_host *host = mmc_priv(mmc); - int ret = 0; clk_prepare_enable(host->clk_per); clk_prepare_enable(host->clk_ipg); - if (mmc) - ret = mmc_resume_host(mmc); - - return ret; + return 0; } static const struct dev_pm_ops mxcmci_pm_ops = {