From patchwork Tue Jun 25 01:20:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaehoon Chung X-Patchwork-Id: 2774141 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 4D920C0AB1 for ; Tue, 25 Jun 2013 01:21:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 55F3C201BC for ; Tue, 25 Jun 2013 01:21:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 47909201B5 for ; Tue, 25 Jun 2013 01:20:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751006Ab3FYBU5 (ORCPT ); Mon, 24 Jun 2013 21:20:57 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:12306 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750745Ab3FYBU4 (ORCPT ); Mon, 24 Jun 2013 21:20:56 -0400 Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MOX00KHID295570@mailout4.samsung.com> for linux-mmc@vger.kernel.org; Tue, 25 Jun 2013 10:20:55 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.113]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id 95.F5.11618.770F8C15; Tue, 25 Jun 2013 10:20:55 +0900 (KST) X-AuditID: cbfee691-b7fef6d000002d62-20-51c8f077ceb5 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 98.73.21068.670F8C15; Tue, 25 Jun 2013 10:20:55 +0900 (KST) Received: from [10.90.51.55] by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MOX004QGD2UE060@mmp1.samsung.com>; Tue, 25 Jun 2013 10:20:54 +0900 (KST) Message-id: <51C8F07A.9060709@samsung.com> Date: Tue, 25 Jun 2013 10:20:58 +0900 From: Jaehoon Chung User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20130510 Thunderbird/17.0.6 MIME-version: 1.0 To: "linux-mmc@vger.kernel.org" Cc: 'Chris Ball' , Kyungmin Park , =?ISO-8859-1?Q?Heiko_St=FCbner?= Subject: [PATCH 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+NgFprIIsWRmVeSWpSXmKPExsWyRsSkULf8w4lAgzmTuSy2v97IZvH/0WtW i7NNb9gtjvzvZ3Rg8Th0ZS2jR9+WVYwe26/NY/b4vEkugCWKyyYlNSezLLVI3y6BK+PPoyeM BUtlKr61JTcw7pfoYuTkkBAwkeh/vIoRwhaTuHBvPVsXIxeHkMBSRolZf/czwxT1nWpihkgs YpT43n+TCSQhJPCSUWL+hAAQm1dAS2LZsr1gDSwCqhLXu96xgthsAjoS278dB6sXFQiT2NTT zARRLyjxY/I9li5GDg4RAWuJ5t+yIPOZBZoYJb7smcIOUiMMVL/42F2wOcxAc/a3TmODsOUl Nq95C3aQhMB0dokLS1ZDLRaQ+Db5ENhQCQFZiU0HoB6QlDi44gbLBEaRWUhWz0IydhaSsQsY mVcxiqYWJBcUJ6UXmeoVJ+YWl+al6yXn525iBEbH6X/PJu5gvH/A+hBjMtDKicxSosn5wOjK K4k3NDYzsjA1MTU2Mrc0I01YSZxXvcU6UEggPbEkNTs1tSC1KL6oNCe1+BAjEwenVAOjuMI3 tzMzv1zU6bx7dN185oBH4oJvEvfZvuf/4Sp9W+Bj8Lsqv5bmAtmVPJYbVaUtcr2VKkQUdxQ9 qtCZGvny0D+OiWXF549c36Ei/2Hu6xzReYzea4QP3nqiLGyi/HfJ0Y2bXNkiWtIWp1Se8d2g +cBX9PIlZuajxu/EWphuX3931cyq4ZqZEktxRqKhFnNRcSIAgT86q6QCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrHIsWRmVeSWpSXmKPExsVy+t9jAd3yDycCDfo+M1lsf72RzeL/o9es Fmeb3rBbHPnfz+jA4nHoylpGj74tqxg9tl+bx+zxeZNcAEtUA6NNRmpiSmqRQmpecn5KZl66 rZJ3cLxzvKmZgaGuoaWFuZJCXmJuqq2Si0+ArltmDtBOJYWyxJxSoFBAYnGxkr4dpgmhIW66 FjCNEbq+IUFwPUYGaCBhDWPGn0dPGAuWylR8a0tuYNwv0cXIySEhYCLRd6qJGcIWk7hwbz1b FyMXh5DAIkaJ7/03mUASQgIvGSXmTwgAsXkFtCSWLdsL1sAioCpxvesdK4jNJqAjsf3bcbB6 UYEwiU09zUwQ9YISPybfY+li5OAQEbCWaP4tCzKfWaCJUeLLninsIDXCQPWLj90Fm8MMNGd/ 6zQ2CFteYvOat8wTGPlmIRk1C0nZLCRlCxiZVzGKphYkFxQnpeca6RUn5haX5qXrJefnbmIE x94z6R2MqxosDjEKcDAq8fB+iDsRKMSaWFZcmXuIUYKDWUmEN1QEKMSbklhZlVqUH19UmpNa fIgxGejTicxSosn5wLSQVxJvaGxiZmRpZG5oYWRsTpqwkjjvwVbrQCGB9MSS1OzU1ILUIpgt TBycUg2MHbU7Ao8p7eHy/8a6r3/ba7XDvHJyW2JuictcnZd3QLSl5ove5R1RNmUT1nLOSOed Ge04vZ2v/ajpYUke05Cjvw3TJ6Y0XJiVcDMjY8n5bPEzii89pmle2tKkEFC4b13n4Vm356dN uyqTn7Iv+Yeq7CmXivUpQRmLvwd7nrxlIn7SbM1cxy/mSizFGYmGWsxFxYkAvgwJiAEDAAA= 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.0 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 --- 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);