From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiko =?iso-8859-1?q?St=FCbner?= Subject: Re: [PATCH 3/4] mmc: sdhci-s3c: revert "fix missing clock for gpio card-detect" Date: Tue, 25 Jun 2013 21:46:15 +0200 Message-ID: <201306252146.16307.heiko@sntech.de> References: <51C8F07A.9060709@samsung.com> Mime-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Return-path: Received: from gloria.sntech.de ([95.129.55.99]:36240 "EHLO gloria.sntech.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751788Ab3FYTqV (ORCPT ); Tue, 25 Jun 2013 15:46:21 -0400 In-Reply-To: <51C8F07A.9060709@samsung.com> Sender: linux-mmc-owner@vger.kernel.org List-Id: linux-mmc@vger.kernel.org To: Jaehoon Chung Cc: "linux-mmc@vger.kernel.org" , 'Chris Ball' , Kyungmin Park Am Dienstag, 25. Juni 2013, 03:20:58 schrieb Jaehoon Chung: > 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 on a s3c2416: Tested-by: Heiko Stuebner > --- > 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 cfcacc3..f1d5965 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);