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: 6452931 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E7C4D9F6CD for ; Thu, 21 May 2015 07:19:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2156D2044C for ; Thu, 21 May 2015 07:19:03 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D6AB120435 for ; Thu, 21 May 2015 07:19:01 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YvKiN-0000Rk-5y; Thu, 21 May 2015 07:16:23 +0000 Received: from mail.kmu-office.ch ([2a02:418:6a02::a2]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YvKhb-0007kK-4w for linux-arm-kernel@lists.infradead.org; Thu, 21 May 2015 07:15:36 +0000 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150521_001535_390372_B24C99B3 X-CRM114-Status: UNSURE ( 8.46 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.1 (/) Cc: jszhang@marvell.com, anton@enomsg.org, linux-mmc@vger.kernel.org, chris@printf.net, stefan@agner.ch, linux-kernel@vger.kernel.org, zhangfei.gao@marvell.com, gregory.clement@free-electrons.com, shawn.guo@linaro.org, b29396@freescale.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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) };