From patchwork Thu Sep 26 14:54:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 20603 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f69.google.com (mail-yh0-f69.google.com [209.85.213.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 549DD24687 for ; Thu, 26 Sep 2013 14:55:37 +0000 (UTC) Received: by mail-yh0-f69.google.com with SMTP id c41sf1095982yho.0 for ; Thu, 26 Sep 2013 07:55:37 -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=q04eVAQ6HWzLrEwvnwNAPpzTjWg6yCfWEG8pBKoy5Vg=; b=eoSWqt+bmLer0bZJRoR4FYkzb1ZkvcYn96qZZkKxwVMTNPNhLNabwlWA71XhkAN/U+ 1lYyr+J0CSDIirjspwSRkpn0rPqXzEQrHI2RPfqymCwLk4VMKaD13PQHGjZteo9JhDw1 RkNEQR3cxxLWEkf+lpa21xJw01jLSjvV/ODZGD2k9dem4L20c2X0cZTpvRK1f4g1C+9v 53NWjRKxitKHZZSVbiQbOfMyPxGup6LGh5YiOk5uzzTRsn1c8hdM5cRlUOitJzAtz9g9 lz1DgjS5DP32mpPtnc2FE1tyJtfTh0CyVDQmNNUdpQ1uUY0IZy5liZOKdektw2PNncLw N9jg== X-Gm-Message-State: ALoCoQmH+9sCyyTlfplVwCr1Zs5ZqlAEoqGNHPX64CX+VodXysXgYs+oPUCR0ixkG712XutwVzzp X-Received: by 10.236.216.17 with SMTP id f17mr277906yhp.18.1380207337031; Thu, 26 Sep 2013 07:55:37 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.48.41 with SMTP id i9ls1053003qen.44.gmail; Thu, 26 Sep 2013 07:55:36 -0700 (PDT) X-Received: by 10.221.55.4 with SMTP id vw4mr480886vcb.37.1380207336893; Thu, 26 Sep 2013 07:55:36 -0700 (PDT) Received: from mail-vb0-f46.google.com (mail-vb0-f46.google.com [209.85.212.46]) by mx.google.com with ESMTPS id gw1si498696vcb.62.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 07:55:36 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.46 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.46; Received: by mail-vb0-f46.google.com with SMTP id p13so913196vbe.33 for ; Thu, 26 Sep 2013 07:55:06 -0700 (PDT) X-Received: by 10.59.9.138 with SMTP id ds10mr1023088ved.5.1380207306737; Thu, 26 Sep 2013 07:55:06 -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 u4csp371082vcz; Thu, 26 Sep 2013 07:55:06 -0700 (PDT) X-Received: by 10.14.184.132 with SMTP id s4mr1900108eem.13.1380207305653; Thu, 26 Sep 2013 07:55:05 -0700 (PDT) Received: from mail-ee0-f54.google.com (mail-ee0-f54.google.com [74.125.83.54]) by mx.google.com with ESMTPS id w44si1849556eef.195.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 07:55:05 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.83.54 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=74.125.83.54; Received: by mail-ee0-f54.google.com with SMTP id e53so609462eek.13 for ; Thu, 26 Sep 2013 07:55:05 -0700 (PDT) X-Received: by 10.14.100.138 with SMTP id z10mr1958785eef.74.1380207305113; Thu, 26 Sep 2013 07:55:05 -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:04 -0700 (PDT) From: Ulf Hansson To: linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, Chris Ball Cc: Ulf Hansson , Manuel Lauss Subject: [PATCH 02/27] mmc: au1xmmc: Move away from using deprecated APIs Date: Thu, 26 Sep 2013 16:54:27 +0200 Message-Id: <1380207292-16968-3-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.212.46 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: Manuel Lauss Signed-off-by: Ulf Hansson --- drivers/mmc/host/au1xmmc.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/mmc/host/au1xmmc.c b/drivers/mmc/host/au1xmmc.c index df9becd..f5443a6 100644 --- a/drivers/mmc/host/au1xmmc.c +++ b/drivers/mmc/host/au1xmmc.c @@ -1157,11 +1157,6 @@ static int au1xmmc_remove(struct platform_device *pdev) static int au1xmmc_suspend(struct platform_device *pdev, pm_message_t state) { struct au1xmmc_host *host = platform_get_drvdata(pdev); - int ret; - - ret = mmc_suspend_host(host->mmc); - if (ret) - return ret; au_writel(0, HOST_CONFIG2(host)); au_writel(0, HOST_CONFIG(host)); @@ -1178,7 +1173,7 @@ static int au1xmmc_resume(struct platform_device *pdev) au1xmmc_reset_controller(host); - return mmc_resume_host(host->mmc); + return 0; } #else #define au1xmmc_suspend NULL