From patchwork Thu Sep 26 14:54:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 20609 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f199.google.com (mail-qc0-f199.google.com [209.85.216.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C7D0A24687 for ; Thu, 26 Sep 2013 14:55:59 +0000 (UTC) Received: by mail-qc0-f199.google.com with SMTP id u18sf1071331qcx.10 for ; Thu, 26 Sep 2013 07:55:59 -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=u8Dx3gscJAwDd7+L7YwNxZPVTbeUajqcSndYbpP7vRM=; b=I8xbqwCRsohyRyrDk+Lh3S6FRJ6lxWcLpLUPiX7bvAxoYFP2w45LlHufLFiG4O1cxO 94n+n3za2Isbvjx9pzkQOBU0ZlDYXZqpJavbhB/oJGdl7Ecvgd8VeQFRZKhBRRMrbB1v vjW6WAbg/l/AFsWGsHXOuk58VKAQcKcQMKPkh7STbvg9pfr873Otnff3sqgmOShN8/71 dV6/ZA1asdpaMztiBb+gtD6u9TZMxfb/ITTdyymTkOdwJUXcJXMJJBXU1zSgnXnK8Aq1 FCgUNra6O7+VWmw0xkKiIfxlfc5BLc1WxbBbWNEBg0LxJ/MKmnWIS5GT0bHsWcdoq6Qx ichw== X-Gm-Message-State: ALoCoQkY51zTVTkMgRKn6QAEnppD7FdyFATaEGHcm6PVKVhSdnZSnt0V0xb+HbzPTiC3o0ynqTXu X-Received: by 10.236.115.198 with SMTP id e46mr282231yhh.33.1380207359646; Thu, 26 Sep 2013 07:55:59 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.71.83 with SMTP id s19ls941895qeu.7.gmail; Thu, 26 Sep 2013 07:55:59 -0700 (PDT) X-Received: by 10.52.33.98 with SMTP id q2mr114168vdi.50.1380207359514; Thu, 26 Sep 2013 07:55:59 -0700 (PDT) Received: from mail-ve0-f181.google.com (mail-ve0-f181.google.com [209.85.128.181]) by mx.google.com with ESMTPS id cz7si502892veb.33.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 07:55:59 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.181; Received: by mail-ve0-f181.google.com with SMTP id oy12so972774veb.40 for ; Thu, 26 Sep 2013 07:55:29 -0700 (PDT) X-Received: by 10.221.64.17 with SMTP id xg17mr1008423vcb.5.1380207329406; Thu, 26 Sep 2013 07:55:29 -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 u4csp371095vcz; Thu, 26 Sep 2013 07:55:28 -0700 (PDT) X-Received: by 10.14.39.71 with SMTP id c47mr747624eeb.88.1380207328457; Thu, 26 Sep 2013 07:55:28 -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 z8si1811028eee.353.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 07:55:28 -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 e53so609748eek.13 for ; Thu, 26 Sep 2013 07:55:28 -0700 (PDT) X-Received: by 10.15.56.72 with SMTP id x48mr1399256eew.62.1380207327768; Thu, 26 Sep 2013 07:55:27 -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:26 -0700 (PDT) From: Ulf Hansson To: linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, Chris Ball Cc: Ulf Hansson , David Brown , Daniel Walker , Bryan Huntsman , linux-arm-msm@vger.kernel.org Subject: [PATCH 08/27] mmc: msm_sdcc: Move away from using deprecated APIs Date: Thu, 26 Sep 2013 16:54:33 +0200 Message-Id: <1380207292-16968-9-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.128.181 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. Additionally, remove dead code which also used the deprecated APIs. Cc: David Brown Cc: Daniel Walker Cc: Bryan Huntsman Cc: linux-arm-msm@vger.kernel.org Signed-off-by: Ulf Hansson --- drivers/mmc/host/msm_sdcc.c | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c index b900de4..9405ecd 100644 --- a/drivers/mmc/host/msm_sdcc.c +++ b/drivers/mmc/host/msm_sdcc.c @@ -1416,28 +1416,10 @@ ioremap_free: } #ifdef CONFIG_PM -#ifdef CONFIG_MMC_MSM7X00A_RESUME_IN_WQ -static void -do_resume_work(struct work_struct *work) -{ - struct msmsdcc_host *host = - container_of(work, struct msmsdcc_host, resume_task); - struct mmc_host *mmc = host->mmc; - - if (mmc) { - mmc_resume_host(mmc); - if (host->stat_irq) - enable_irq(host->stat_irq); - } -} -#endif - - static int msmsdcc_suspend(struct platform_device *dev, pm_message_t state) { struct mmc_host *mmc = mmc_get_drvdata(dev); - int rc = 0; if (mmc) { struct msmsdcc_host *host = mmc_priv(mmc); @@ -1445,14 +1427,11 @@ msmsdcc_suspend(struct platform_device *dev, pm_message_t state) if (host->stat_irq) disable_irq(host->stat_irq); - if (mmc->card && mmc->card->type != MMC_TYPE_SDIO) - rc = mmc_suspend_host(mmc); - if (!rc) - msmsdcc_writel(host, 0, MMCIMASK0); + msmsdcc_writel(host, 0, MMCIMASK0); if (host->clks_on) msmsdcc_disable_clocks(host, 0); } - return rc; + return 0; } static int @@ -1467,8 +1446,6 @@ msmsdcc_resume(struct platform_device *dev) msmsdcc_writel(host, host->saved_irq0mask, MMCIMASK0); - if (mmc->card && mmc->card->type != MMC_TYPE_SDIO) - mmc_resume_host(mmc); if (host->stat_irq) enable_irq(host->stat_irq); #if BUSCLK_PWRSAVE