From patchwork Sun Oct 9 14:02:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Lin X-Patchwork-Id: 9368503 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6026C6077E for ; Sun, 9 Oct 2016 13:58:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 522F228FA9 for ; Sun, 9 Oct 2016 13:58:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 46FF328FAD; Sun, 9 Oct 2016 13:58:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DAD4228FA9 for ; Sun, 9 Oct 2016 13:58:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751518AbcJIN6B (ORCPT ); Sun, 9 Oct 2016 09:58:01 -0400 Received: from lucky1.263xmail.com ([211.157.147.133]:49894 "EHLO lucky1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751488AbcJIN6A (ORCPT ); Sun, 9 Oct 2016 09:58:00 -0400 Received: from shawn.lin?rock-chips.com (unknown [192.168.167.228]) by lucky1.263xmail.com (Postfix) with ESMTP id CF64753D76; Sun, 9 Oct 2016 21:57:51 +0800 (CST) X-263anti-spam: KSV:0; X-MAIL-GRAY: 1 X-MAIL-DELIVERY: 0 X-KSVirus-check: 0 X-ABS-CHECKED: 4 X-ADDR-CHECKED4: 1 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.263.net (Postfix) with ESMTP id 7F2EA3BA; Sun, 9 Oct 2016 21:57:53 +0800 (CST) X-RL-SENDER: shawn.lin@rock-chips.com X-FST-TO: jh80.chung@samsung.com X-SENDER-IP: 58.22.7.114 X-LOGIN-NAME: shawn.lin@rock-chips.com X-UNIQUE-TAG: X-ATTACHMENT-NUM: 0 X-SENDER: lintao@rock-chips.com X-DNS-TYPE: 0 Received: from unknown (unknown [58.22.7.114]) by smtp.263.net (Postfix) whith SMTP id 26662XQPOKW; Sun, 09 Oct 2016 21:57:54 +0800 (CST) From: Shawn Lin To: Jaehoon Chung , Ulf Hansson Cc: linux-mmc@vger.kernel.org, Doug Anderson , linux-rockchip@lists.infradead.org, Shawn Lin Subject: [RESEND PATCH 9/9] mmc: dw_mmc: remove system PM callback Date: Sun, 9 Oct 2016 22:02:01 +0800 Message-Id: <1476021721-923-5-git-send-email-shawn.lin@rock-chips.com> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1476021721-923-1-git-send-email-shawn.lin@rock-chips.com> References: <1476021506-869-1-git-send-email-shawn.lin@rock-chips.com> <1476021721-923-1-git-send-email-shawn.lin@rock-chips.com> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Now there are no variant drivers using dw_mci_suspend and dw_mci_resume, so let's remove it. Signed-off-by: Shawn Lin --- drivers/mmc/host/dw_mmc.c | 44 ++++++++------------------------------------ drivers/mmc/host/dw_mmc.h | 2 -- 2 files changed, 8 insertions(+), 38 deletions(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index c5ef263..46a14c5 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -3267,26 +3267,24 @@ EXPORT_SYMBOL(dw_mci_remove); #ifdef CONFIG_PM -/* - * TODO: we should probably disable the clock to the card in the suspend path. - */ -int dw_mci_suspend(struct dw_mci *host) +int dw_mci_runtime_suspend(struct dw_mci *host) { if (host->use_dma && host->dma_ops->exit) host->dma_ops->exit(host); + clk_disable_unprepare(host->ciu_clk); + return 0; } -EXPORT_SYMBOL(dw_mci_suspend); +EXPORT_SYMBOL(dw_mci_runtime_suspend); -int dw_mci_resume(struct dw_mci *host) +int dw_mci_runtime_resume(struct dw_mci *host) { - int i, ret; + int i, ret = 0; - if (!dw_mci_ctrl_reset(host, SDMMC_CTRL_ALL_RESET_FLAGS)) { - ret = -ENODEV; + ret = clk_prepare_enable(host->ciu_clk); + if (ret) return ret; - } if (host->use_dma && host->dma_ops->init) host->dma_ops->init(host); @@ -3323,32 +3321,6 @@ int dw_mci_resume(struct dw_mci *host) return 0; } -EXPORT_SYMBOL(dw_mci_resume); - -int dw_mci_runtime_suspend(struct dw_mci *host) -{ - int err = 0; - - err = dw_mci_suspend(host); - if (err) - return err; - - clk_disable_unprepare(host->ciu_clk); - - return err; -} -EXPORT_SYMBOL(dw_mci_runtime_suspend); - -int dw_mci_runtime_resume(struct dw_mci *host) -{ - int ret = 0; - - ret = clk_prepare_enable(host->ciu_clk); - if (ret) - return ret; - - return dw_mci_resume(host); -} EXPORT_SYMBOL(dw_mci_runtime_resume); #endif /* CONFIG_PM */ diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h index baa7261..b642dbb 100644 --- a/drivers/mmc/host/dw_mmc.h +++ b/drivers/mmc/host/dw_mmc.h @@ -235,8 +235,6 @@ extern int dw_mci_probe(struct dw_mci *host); extern void dw_mci_remove(struct dw_mci *host); #ifdef CONFIG_PM -extern int dw_mci_suspend(struct dw_mci *host); -extern int dw_mci_resume(struct dw_mci *host); extern int dw_mci_runtime_suspend(struct dw_mci *host); extern int dw_mci_runtime_resume(struct dw_mci *host); #endif