From patchwork Fri May 30 03:56:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jingoo Han X-Patchwork-Id: 4268591 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 C4D10BEEA7 for ; Fri, 30 May 2014 03:56:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B75212037F for ; Fri, 30 May 2014 03:56:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 00B832037E for ; Fri, 30 May 2014 03:56:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752165AbaE3D4j (ORCPT ); Thu, 29 May 2014 23:56:39 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:21602 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751919AbaE3D4i (ORCPT ); Thu, 29 May 2014 23:56:38 -0400 Received: from epcpsbgr3.samsung.com (u143.gpu120.samsung.co.kr [203.254.230.143]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N6D00JZAC9XMIB0@mailout1.samsung.com> for linux-mmc@vger.kernel.org; Fri, 30 May 2014 12:56:21 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [203.254.230.50]) by epcpsbgr3.samsung.com (EPCPMTA) with SMTP id 0F.01.14704.56108835; Fri, 30 May 2014 12:56:21 +0900 (KST) X-AuditID: cbfee68f-b7fef6d000003970-b6-53880165e516 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id F8.37.08203.56108835; Fri, 30 May 2014 12:56:21 +0900 (KST) Received: from DOJG1HAN03 ([12.36.166.146]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N6D006BZC9XYSM0@mmp2.samsung.com>; Fri, 30 May 2014 12:56:21 +0900 (KST) From: Jingoo Han To: 'Ulf Hansson' , 'Chris Ball' Cc: linux-mmc@vger.kernel.org, 'Ben Dooks' , 'Jaehoon Chung' , 'Seungwon Jeon' , 'Jingoo Han' Subject: [PATCH] mmc: sdhci-s3c: call sdhci_card_event() instead of card tasklet Date: Fri, 30 May 2014 12:56:21 +0900 Message-id: <000c01cf7bbb$1e190250$5a4b06f0$%han@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=US-ASCII Content-transfer-encoding: 7bit X-Mailer: Microsoft Office Outlook 12.0 Thread-index: Ac97ux3+DvCZ2hcoRn65Yf4iMHzSZg== Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrGIsWRmVeSWpSXmKPExsVy+t8zI91Uxo5gg5sLhSwmrTvAZDHh8nZG i8sLL7Fa3PjVxmpx5H8/o8WH+xeZLY6vDXdg9/i76gWzx51re9g8brxayOTRt2UVo8fnTXIB rFFcNimpOZllqUX6dglcGb8mtbMXLOSqOHB/O3MD432OLkZODgkBE4ldm28zQthiEhfurWfr YuTiEBJYxiix5PtFZpiil19uMUIkpjNKXJi+lwUkISTwm1Hi7Q4PEJtNQE3iy5fD7CC2iIC3 xIcba5lBGpgFdjFKvNz+Gshh5xAWCJDYotTFyMHBIqAqcfKMJ0g1r4CtxNp/R5khbEGJH5Pv gU1nFtCS2LytiRXClpfYvOYtM0irhIC6xKO/uhCL9CRmbuqAKhGR2PfiHdiVEgKX2CV6p68D S7AICEh8m3yIBaJXVmLTAaivJCUOrrjBMoFRbBaSzbOQbJ6FZPMsJCsWMLKsYhRNLUguKE5K LzLWK07MLS7NS9dLzs/dxAiJw/4djHcPWB9iTAZaP5FZSjQ5HxjHeSXxhsZmRhamJqbGRuaW ZqQJK4nz3n+YFCQkkJ5YkpqdmlqQWhRfVJqTWnyIkYmDU6qBcUJg2seOzVul3fP5VNe8ap+5 edemP8YfZrbOl9vSWBC8Kf/d72PhHKyqV/sTiyYeY9zYFiu5/pXok+qsOt/NHC/eX+/4kLdh xqYJVat5GGwTuYq/lJyXvdkrdGrR9suzPpW+K53SE69o27eJYRM3X2XNsfmtvRvs2NuTzp+x n9tpfeSHk1ZMkBJLcUaioRZzUXEiAL0nOGLZAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrMKsWRmVeSWpSXmKPExsVy+t9jQd1Uxo5gg09/eS0mrTvAZDHh8nZG i8sLL7Fa3PjVxmpx5H8/o8WH+xeZLY6vDXdg9/i76gWzx51re9g8brxayOTRt2UVo8fnTXIB rFENjDYZqYkpqUUKqXnJ+SmZeem2St7B8c7xpmYGhrqGlhbmSgp5ibmptkouPgG6bpk5QGco KZQl5pQChQISi4uV9O0wTQgNcdO1gGmM0PUNCYLrMTJAAwnrGDN+TWpnL1jIVXHg/nbmBsb7 HF2MnBwSAiYSL7/cYoSwxSQu3FvP1sXIxSEkMJ1R4sL0vSwgCSGB34wSb3d4gNhsAmoSX74c ZgexRQS8JT7cWMsM0sAssItR4uX210AOO4ewQIDEFqUuRg4OFgFViZNnPEGqeQVsJdb+O8oM YQtK/Jh8D2w6s4CWxOZtTawQtrzE5jVvmUFaJQTUJR791YVYpCcxc1MHVImIxL4X7xgnMArM QjJpFpJJs5BMmoWkZQEjyypG0dSC5ILipPRcQ73ixNzi0rx0veT83E2M4Ch/JrWDcWWDxSFG AQ5GJR7exsj2YCHWxLLiytxDjBIczEoivFkPgEK8KYmVValF+fFFpTmpxYcYk4H+nMgsJZqc D0xAeSXxhsYmZkaWRmYWRibm5qQJK4nzHmi1DhQSSE8sSc1OTS1ILYLZwsTBKdXAeLLAJeOf NUuzKkOOUu2FCgbb7xZKU1Qitx5/YvD7doXatmP1Bb+2yv4vLFDcukf3fej8TRxXipqEk9u9 zgU7G1ooiKQ+T5QU6txtH1saffTG3JUPhfn79wo/WnbsU/SMkuXLFy7e80bgZsjytnPxapeL 1n0psXVIOnZxX0yORS3/e3WmZ8dKlViKMxINtZiLihMBjQSNtjYDAAA= 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=-7.5 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 The card tasklet was removed by the commit 3560db8 (mmc: sdhci: push card_tasklet into threaded irq handler). However, the task let has been used by sdhci_s3c_notify_change() in order to handle GPIO detection. Then, it calls sdhci_tasklet_card(). The card tasklet eventually called sdhci_card_event(). Thus, the sdhci_card_event() should be called directly instead of the card tasklet. This patch also fixes the following build error. drivers/mmc/host/sdhci-s3c.c: In function 'sdhci_s3c_notify_change' drivers/mmc/host/sdhci-s3c.c:402:25: error: 'struct sdhci_host' has no member named 'card_tasklet' Signed-off-by: Jingoo Han --- drivers/mmc/host/sdhci-s3c.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c index 781b8a9..4386e91 100644 --- a/drivers/mmc/host/sdhci-s3c.c +++ b/drivers/mmc/host/sdhci-s3c.c @@ -399,7 +399,8 @@ static void sdhci_s3c_notify_change(struct platform_device *dev, int state) clk_disable_unprepare(sc->clk_io); #endif } - tasklet_schedule(&host->card_tasklet); + host->mmc->ops->card_event(host->mmc); + mmc_detect_change(host->mmc, msecs_to_jiffies(200)); spin_unlock_irqrestore(&host->lock, flags); } }