From patchwork Thu May 21 07:15:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Agner X-Patchwork-Id: 6452821 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 76400C0432 for ; Thu, 21 May 2015 07:15:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 838D62041A for ; Thu, 21 May 2015 07:15:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9DC5720395 for ; Thu, 21 May 2015 07:15:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753958AbbEUHPL (ORCPT ); Thu, 21 May 2015 03:15:11 -0400 Received: from mail.kmu-office.ch ([178.209.48.109]:49659 "EHLO mail.kmu-office.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753643AbbEUHPK (ORCPT ); Thu, 21 May 2015 03:15:10 -0400 Received: from trochilidae.toradex.int (unknown [46.140.72.82]) by mail.kmu-office.ch (Postfix) with ESMTPSA id 424895C113F; Thu, 21 May 2015 09:13:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=agner.ch; s=dkim; t=1432192395; bh=Mcc4y/KHtBSnXVtb8Nu/DGH/h0hWNILv4SmwUgqbLi4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H3v8IvY5o1BpzLVTq/z3NfuUXsQJ5Tphmz8ckU7M9prkNd2m9VrnxSs9AllEHueKw tmTeKo3MjS50c4iHmxEfH4P8qUe0NUMSWGXwDWymC1nbLBCs9f+NPxb5MhtOLjuaXf asj5SBNKT6tIRbTTo3d1bEWPWCxhisyaxd4NoaZU= From: Stefan Agner To: ulf.hansson@linaro.org Cc: gregory.clement@free-electrons.com, zhangfei.gao@marvell.com, jszhang@marvell.com, chris@printf.net, anton@enomsg.org, b29396@freescale.com, shawn.guo@linaro.org, linux-mmc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, stefan@agner.ch Subject: [PATCH v3 2/2] mmc: sdhci-pxav3: use runtime_pm enabled pltfm suspend/resume Date: Thu, 21 May 2015 09:15:04 +0200 Message-Id: <1432192504-3601-2-git-send-email-stefan@agner.ch> X-Mailer: git-send-email 2.4.1 In-Reply-To: <1432192504-3601-1-git-send-email-stefan@agner.ch> References: <1432192504-3601-1-git-send-email-stefan@agner.ch> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_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 Use the runtime_pm enabled platform suspend/resume functions. Signed-off-by: Stefan Agner --- drivers/mmc/host/sdhci-pxav3.c | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c index b5103a2..5ac4030 100644 --- a/drivers/mmc/host/sdhci-pxav3.c +++ b/drivers/mmc/host/sdhci-pxav3.c @@ -501,34 +501,6 @@ static int sdhci_pxav3_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_PM_SLEEP -static int sdhci_pxav3_suspend(struct device *dev) -{ - int ret; - struct sdhci_host *host = dev_get_drvdata(dev); - - pm_runtime_get_sync(dev); - ret = sdhci_suspend_host(host); - pm_runtime_mark_last_busy(dev); - pm_runtime_put_autosuspend(dev); - - return ret; -} - -static int sdhci_pxav3_resume(struct device *dev) -{ - int ret; - struct sdhci_host *host = dev_get_drvdata(dev); - - pm_runtime_get_sync(dev); - ret = sdhci_resume_host(host); - pm_runtime_mark_last_busy(dev); - pm_runtime_put_autosuspend(dev); - - return ret; -} -#endif - #ifdef CONFIG_PM static int sdhci_pxav3_runtime_suspend(struct device *dev) { @@ -564,7 +536,7 @@ static int sdhci_pxav3_runtime_resume(struct device *dev) #ifdef CONFIG_PM static const struct dev_pm_ops sdhci_pxav3_pmops = { - SET_SYSTEM_SLEEP_PM_OPS(sdhci_pxav3_suspend, sdhci_pxav3_resume) + SET_SYSTEM_SLEEP_PM_OPS(sdhci_pltfm_rpm_suspend, sdhci_pltfm_rpm_resume) SET_RUNTIME_PM_OPS(sdhci_pxav3_runtime_suspend, sdhci_pxav3_runtime_resume, NULL) };