From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jaehoon Chung Subject: [PATCH v2 3/4] mmc: sdhci-s3c: revert "fix missing clock for gpio card-detect" Date: Fri, 02 Aug 2013 23:09:01 +0900 Message-ID: <51FBBD7D.2020203@samsung.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: Received: from mailout1.samsung.com ([203.254.224.24]:35720 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751127Ab3HBOJB (ORCPT ); Fri, 2 Aug 2013 10:09:01 -0400 Received: from epcpsbgr1.samsung.com (u141.gpu120.samsung.co.kr [203.254.230.141]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MQW00JXDPYX1HO0@mailout1.samsung.com> for linux-mmc@vger.kernel.org; Fri, 02 Aug 2013 23:08:59 +0900 (KST) Sender: linux-mmc-owner@vger.kernel.org List-Id: linux-mmc@vger.kernel.org To: "linux-mmc@vger.kernel.org" Cc: 'Chris Ball' , Kyungmin Park , =?ISO-8859-1?Q?Heiko_St=FCbner?= Fixed the warning message.(clk_disable/enable didn't pair) [ 2.110000] ------------[ cut here ]------------ [ 2.110000] WARNING: at drivers/clk/clk.c:780 clk_disable+0x18/0x24() [ 2.110000] Modules linked in: [ 2.110000] CPU: 0 PID: 34 Comm: kworker/0:1 Not tainted 3.10.0-rc1-00313-g60e5410-dirty #26 [ 2.110000] Workqueue: pm pm_runtime_work [ 2.110000] [] (unwind_backtrace+0x0/0x138) from [] (show_stack+0x10/0x14) [ 2.110000] [] (show_stack+0x10/0x14) from [] (warn_slowpath_common+0x4c/0x68) [ 2.110000] [] (warn_slowpath_common+0x4c/0x68) from [] (warn_slowpath_null+0x1c/0x24) [ 2.110000] [] (warn_slowpath_null+0x1c/0x24) from [] (clk_disable+0x18/0x24) [ 2.110000] [] (clk_disable+0x18/0x24) from [] (sdhci_s3c_runtime_suspend+0x50/0x64) [ 2.110000] [] (sdhci_s3c_runtime_suspend+0x50/0x64) from [] (pm_generic_runtime_suspend+0x2c/0x40) [ 2.110000] [] (pm_generic_runtime_suspend+0x2c/0x40) from [] (__rpm_callback+0x34/0x70) [ 2.110000] [] (__rpm_callback+0x34/0x70) from [] (rpm_callback+0x28/0x88) [ 2.110000] [] (rpm_callback+0x28/0x88) from [] (rpm_suspend+0xec/0x628) [ 2.110000] [] (rpm_suspend+0xec/0x628) from [] (__pm_runtime_suspend+0x5c/0x74) [ 2.110000] [] (__pm_runtime_suspend+0x5c/0x74) from [] (pm_generic_runtime_idle+0x44/0x4c) [ 2.110000] [] (pm_generic_runtime_idle+0x44/0x4c) from [] (__rpm_callback+0x34/0x70) [ 2.110000] [] (__rpm_callback+0x34/0x70) from [] (rpm_idle+0x104/0x2b8) [ 2.110000] [] (rpm_idle+0x104/0x2b8) from [] (pm_runtime_work+0x88/0x98) [ 2.110000] [] (pm_runtime_work+0x88/0x98) from [] (process_one_work+0x138/0x43c) [ 2.110000] [] (process_one_work+0x138/0x43c) from [] (worker_thread+0x134/0x3e0) [ 2.110000] [] (worker_thread+0x134/0x3e0) from [] (kthread+0xa4/0xb0) [ 2.110000] [] (kthread+0xa4/0xb0) from [] (ret_from_fork+0x14/0x3c) [ 2.110000] ---[ end trace 3c3a259d4aa3ba0a ]-- Signed-off-by: Jaehoon Chung Signed-off-by: Kyungmin Park Acked-by: Heiko Stuebner Tested-by: Heiko Stuebner --- Changelog v2: - Added acked/tested by Heiko (on s3c2416) drivers/mmc/host/sdhci-s3c.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c index 6debda9..f974778 100644 --- a/drivers/mmc/host/sdhci-s3c.c +++ b/drivers/mmc/host/sdhci-s3c.c @@ -373,27 +373,18 @@ static struct sdhci_ops sdhci_s3c_ops = { static void sdhci_s3c_notify_change(struct platform_device *dev, int state) { struct sdhci_host *host = platform_get_drvdata(dev); -#ifdef CONFIG_PM_RUNTIME - struct sdhci_s3c *sc = sdhci_priv(host); -#endif unsigned long flags; if (host) { spin_lock_irqsave(&host->lock, flags); if (state) { dev_dbg(&dev->dev, "card inserted.\n"); -#ifdef CONFIG_PM_RUNTIME - clk_prepare_enable(sc->clk_io); -#endif host->flags &= ~SDHCI_DEVICE_DEAD; host->quirks |= SDHCI_QUIRK_BROKEN_CARD_DETECTION; } else { dev_dbg(&dev->dev, "card removed.\n"); host->flags |= SDHCI_DEVICE_DEAD; host->quirks &= ~SDHCI_QUIRK_BROKEN_CARD_DETECTION; -#ifdef CONFIG_PM_RUNTIME - clk_disable_unprepare(sc->clk_io); -#endif } tasklet_schedule(&host->card_tasklet); spin_unlock_irqrestore(&host->lock, flags); -- 1.7.9.5