From patchwork Thu Sep 26 14:54:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 2948821 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 76199BFF0B for ; Thu, 26 Sep 2013 14:58:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CFC14202D1 for ; Thu, 26 Sep 2013 14:58:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AF07A201EA for ; Thu, 26 Sep 2013 14:58:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752897Ab3IZO5x (ORCPT ); Thu, 26 Sep 2013 10:57:53 -0400 Received: from mail-ea0-f181.google.com ([209.85.215.181]:45276 "EHLO mail-ea0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753347Ab3IZO4L (ORCPT ); Thu, 26 Sep 2013 10:56:11 -0400 Received: by mail-ea0-f181.google.com with SMTP id d10so598711eaj.26 for ; Thu, 26 Sep 2013 07:56:10 -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=z3W3+wMlhZ5KR2ehD+sRuI5LqntyC5JiJ4RijDhj3hs=; b=Hcb9NaRT6N8t89ToBJZPcrgG3Edl6zXeiMGy8w09Cryvi6owYCJWR3t90stwutP0H6 Px41h5xKA5Qpax4NaWyUZQ757rVHG1cWCOX3BzoR8DUJRXON7/eME4Xsf0OzQau0/KaD WR2WUo+aELglS0mscMRqWRl7aPIF3Bf/9oqXPzrybDJ1uGbnZsJoCB7KI+FhIt8Z2jmQ 0MJbYQfqEunlX8PlwxNPaZmwECwIBmDrToUj0sXSLknSKDRvYVKZGilcC03RQrdvYyKB PRz/Yh1Pumc6EH7aMFu75hbn/ifIKXvq1LpV0wh43uTulOi7iSsVNXtKsMQiBsVCA0WA Eh2Q== X-Gm-Message-State: ALoCoQmqEcgH6l5bg9xFvBDb+OfMxDjEOkuEHBT1oCSHq+dJD3kWqKqt8M/4ChxP2tmzZnD/dHbm X-Received: by 10.15.64.1 with SMTP id n1mr1907001eex.15.1380207370520; Thu, 26 Sep 2013 07:56:10 -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:09 -0700 (PDT) From: Ulf Hansson To: linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, Chris Ball Cc: Ulf Hansson , Guennadi Liakhovetski Subject: [PATCH 23/27] mmc: sh_mmcif: Move away from using deprecated APIs Date: Thu, 26 Sep 2013 16:54:48 +0200 Message-Id: <1380207292-16968-24-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 Signed-off-by: Ulf Hansson --- drivers/mmc/host/sh_mmcif.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c index 36629a0..6bffebe 100644 --- a/drivers/mmc/host/sh_mmcif.c +++ b/drivers/mmc/host/sh_mmcif.c @@ -1542,19 +1542,15 @@ static int sh_mmcif_remove(struct platform_device *pdev) static int sh_mmcif_suspend(struct device *dev) { struct sh_mmcif_host *host = dev_get_drvdata(dev); - int ret = mmc_suspend_host(host->mmc); - if (!ret) - sh_mmcif_writel(host->addr, MMCIF_CE_INT_MASK, MASK_ALL); + sh_mmcif_writel(host->addr, MMCIF_CE_INT_MASK, MASK_ALL); - return ret; + return 0; } static int sh_mmcif_resume(struct device *dev) { - struct sh_mmcif_host *host = dev_get_drvdata(dev); - - return mmc_resume_host(host->mmc); + return 0; } #else #define sh_mmcif_suspend NULL