From patchwork Fri Aug 2 14:09:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaehoon Chung X-Patchwork-Id: 2837944 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3E70ABF535 for ; Fri, 2 Aug 2013 14:09:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 07D042041C for ; Fri, 2 Aug 2013 14:09:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1FCEE20418 for ; Fri, 2 Aug 2013 14:09:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751290Ab3HBOJD (ORCPT ); Fri, 2 Aug 2013 10:09:03 -0400 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) Received: from epcpsbgm2.samsung.com ( [172.20.52.112]) by epcpsbgr1.samsung.com (EPCPMTA) with SMTP id C7.3A.17404.B7DBBF15; Fri, 02 Aug 2013 23:08:59 +0900 (KST) X-AuditID: cbfee68d-b7f096d0000043fc-20-51fbbd7b0df1 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id B5.E5.31505.B7DBBF15; Fri, 02 Aug 2013 23:08:59 +0900 (KST) Received: from [10.252.81.186] by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MQW00JYKPYZJK00@mmp2.samsung.com>; Fri, 02 Aug 2013 23:08:59 +0900 (KST) Message-id: <51FBBD7D.2020203@samsung.com> Date: Fri, 02 Aug 2013 23:09:01 +0900 From: Jaehoon Chung User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20130623 Thunderbird/17.0.7 MIME-version: 1.0 To: "linux-mmc@vger.kernel.org" Cc: 'Chris Ball' , Kyungmin Park , =?ISO-8859-1?Q?Heiko_St=FCbner?= Subject: [PATCH v2 3/4] mmc: sdhci-s3c: revert "fix missing clock for gpio card-detect" Content-type: text/plain; charset=ISO-8859-1 Content-transfer-encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprEIsWRmVeSWpSXmKPExsWyRsSkQLd67+9Agw/TdC22v97IZvH/0WtW i7NNb9gtjvzvZ3Rg8Th0ZS2jR9+WVYwe26/NY/b4vEkugCWKyyYlNSezLLVI3y6BK+PflEuM BXtkK378fsDYwLhPsouRk0NCwESib+4bJghbTOLCvfVsXYxcHEICSxklHt/uZoEpOvt1NiNE YjqjRO++PlYI5zWjxLkLE5i7GDk4eAW0JLpXyII0sAioSjxdMosZxGYT0JHY/u042AZRgTCJ Jd8es4HYvAKCEj8m32MBaRURsJZo/i0LMpJZoIlR4sueKewgNcICkRILd/8C62UGmrO/dRob hC0vsXnNW2aQBgmBRewSHY/3sEIsFpD4NvkQ2FAJAVmJTQeYIR6QlDi44gbLBEaRWUhWz0Iy dhaSsQsYmVcxiqYWJBcUJ6UXGeoVJ+YWl+al6yXn525iBMbH6X/Pencw3j5gfYgxGWjlRGYp 0eR8YHzllcQbGpsZWZiamBobmVuakSasJM6r1mIdKCSQnliSmp2aWpBaFF9UmpNafIiRiYNT qoFxmaFic9UOMROrl59DHrAFBJ09mVIa43iyQ5qlVbW62oL7uBD34/TG25Or9r+tF8oryP0k VyMSwNpVlPVqZcT3TuNKB0srzcXr92+xapxqLbZaO/dzw4IE1ou2cSfNmUPiAxpC+VtzjzNO sr7e4Pjs4055bfH1znX1t+t+3+Y83nnnxLWDFkosxRmJhlrMRcWJACUTKUelAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrPIsWRmVeSWpSXmKPExsVy+t9jQd3qvb8DDZpnq1lsf72RzeL/o9es Fmeb3rBbHPnfz+jA4nHoylpGj74tqxg9tl+bx+zxeZNcAEtUA6NNRmpiSmqRQmpecn5KZl66 rZJ3cLxzvKmZgaGuoaWFuZJCXmJuqq2Si0+ArltmDtBOJYWyxJxSoFBAYnGxkr4dpgmhIW66 FjCNEbq+IUFwPUYGaCBhDWPGvymXGAv2yFb8+P2AsYFxn2QXIyeHhICJxNmvsxkhbDGJC/fW s3UxcnEICUxnlOjd18cK4bxmlDh3YQJzFyMHB6+AlkT3ClmQBhYBVYmnS2Yxg9hsAjoS278d ZwKxRQXCJJZ8e8wGYvMKCEr8mHyPBaRVRMBaovm3LMhIZoEmRokve6awg9QIC0RKLNz9C6yX GWjO/tZpbBC2vMTmNW+ZJzDyzUIyahaSsllIyhYwMq9iFE0tSC4oTkrPNdIrTswtLs1L10vO z93ECI6+Z9I7GFc1WBxiFOBgVOLhfZD5K1CINbGsuDL3EKMEB7OSCO+f2UAh3pTEyqrUovz4 otKc1OJDjMlAn05klhJNzgcmhrySeENjEzMjSyNzQwsjY3PShJXEeQ+2WgcKCaQnlqRmp6YW pBbBbGHi4JRqYBTc/6PtyVuph9MtXzjNFxfKOcC3pe7osVw3yferr+t4TvhTUeB2O++/UFH7 b+4e8TdC9n72Dx+v+bNZe+VM1bXldzc+9C7mXL43S+fZtd31EoEMfsU6xl25e/Syvt/vEHln xOFXMmH9Qm/fSr6nd+f+Ws/81uuKhdqDYxOO7lx9JePlw9KwbVFKLMUZiYZazEXFiQDUeJT4 AgMAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 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);