From patchwork Tue Jan 21 10:16:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaehoon Chung X-Patchwork-Id: 3516211 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0B77C9F2E9 for ; Tue, 21 Jan 2014 10:16:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6D2302010E for ; Tue, 21 Jan 2014 10:16:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4C69320148 for ; Tue, 21 Jan 2014 10:16:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754179AbaAUKQi (ORCPT ); Tue, 21 Jan 2014 05:16:38 -0500 Received: from mailout4.samsung.com ([203.254.224.34]:12988 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754122AbaAUKQg (ORCPT ); Tue, 21 Jan 2014 05:16:36 -0500 Received: from epcpsbgr3.samsung.com (u143.gpu120.samsung.co.kr [203.254.230.143]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MZQ00K3VXVNK980@mailout4.samsung.com> for linux-mmc@vger.kernel.org; Tue, 21 Jan 2014 19:16:35 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.113]) by epcpsbgr3.samsung.com (EPCPMTA) with SMTP id B4.57.10092.3094ED25; Tue, 21 Jan 2014 19:16:35 +0900 (KST) X-AuditID: cbfee68f-b7f156d00000276c-bf-52de4903b752 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 50.8D.28157.3094ED25; Tue, 21 Jan 2014 19:16:35 +0900 (KST) Received: from [10.252.81.186] by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MZQ00K0MXVNL650@mmp1.samsung.com>; Tue, 21 Jan 2014 19:16:35 +0900 (KST) Message-id: <52DE491B.9070007@samsung.com> Date: Tue, 21 Jan 2014 19:16:59 +0900 From: Jaehoon Chung User-Agent: Mozilla/5.0 (X11; Linux i686; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 MIME-version: 1.0 To: "linux-mmc@vger.kernel.org" Cc: Chris Ball , Seungwon Jeon Subject: [PATCH 7/7] mmc: dw_mmc: remove the dw_mci_of_cd_gpio() Content-type: text/plain; charset=ISO-8859-1 Content-transfer-encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupgkeLIzCtJLcpLzFFi42JZI2JSqMvseS/IYP9DDYsJl7czWhz5389o 8eH+RWYHZo8brxYyefRtWcXo8XmTXABzFJdNSmpOZllqkb5dAlfGi4NbmAsO81bsfNXM2sDY zt3FyMkhIWAicWH2JxYIW0ziwr31bF2MXBxCAksZJQ5vucgOUzTrbj8LRGIRo8TqrsOMEM5r RondO06wglTxCmhJPLp9ignEZhFQlehdc54NxGYT0JHY/u04WFxUIExi6omrLBD1ghI/Jt8D sjk4RASsJZp/y4KEmQXcJaZ8vAW2WFjAQeL8ivcsEHEdif2t09ggbHmJzWveMoPcICHQzi7x 6uVeFoi9AhLfJh8CmykhICux6QAzxAOSEgdX3GCZwCgyC8nmWUjGzkIydgEj8ypG0dSC5ILi pPQiY73ixNzi0rx0veT83E2MwFg4/e9Z/w7GuwesDzEmA62cyCwlmpwPjKW8knhDYzMjC1MT U2Mjc0sz0oSVxHnvP0wKEhJITyxJzU5NLUgtii8qzUktPsTIxMEp1cDIcl6hWmi+VcKOWbdZ Ktc0iW28pCefsHnV/J3iL/ouCLuHKjUsdjVKusH297vE8+jo5KwHzhJN91ZNnSyiFLX/SBHb xYhdGz88SWqM6Ld6Nm1bwsUbwiW+3ze3vm2fb6O+ZFaz0AyGM4fuabJOmXmM3ZJhk/jOTVHe ERuu3bnXJ6L1567QX3FpJZbijERDLeai4kQALWy4LpsCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrKIsWRmVeSWpSXmKPExsVy+t9jAV1mz3tBBk0fFC0mXN7OaHHkfz+j xYf7F5kdmD1uvFrI5NG3ZRWjx+dNcgHMUQ2MNhmpiSmpRQqpecn5KZl56bZK3sHxzvGmZgaG uoaWFuZKCnmJuam2Si4+AbpumTlAm5QUyhJzSoFCAYnFxUr6dpgmhIa46VrANEbo+oYEwfUY GaCBhDWMGS8ObmEuOMxbsfNVM2sDYzt3FyMnh4SAicSsu/0sELaYxIV769m6GLk4hAQWMUqs 7jrMCOG8ZpTYveMEK0gVr4CWxKPbp5hAbBYBVYneNefZQGw2AR2J7d+Og8VFBcIkpp64ygJR LyjxY/I9IJuDQ0TAWqL5tyxImFnAXWLKx1vsILawgIPE+RXvWSDiOhL7W6exQdjyEpvXvGWe wMg3C8mkWUjKZiEpW8DIvIpRNLUguaA4KT3XSK84Mbe4NC9dLzk/dxMjONKeSe9gXNVgcYhR gINRiYe3YuPdICHWxLLiytxDjBIczEoivMcc7wUJ8aYkVlalFuXHF5XmpBYfYkwGenQis5Ro cj4wCeSVxBsam5gZWRqZG1oYGZuTJqwkznuw1TpQSCA9sSQ1OzW1ILUIZgsTB6dUA6NFyj9R dpElnbPOc6hd01yc+eWaK+PCgMzm+lPMNuW+4tpuC0scJk5P+mV0/Kk/R8iVaPtpnS6qGf6W eYZTE+O+tUd7+D5tXlt9rGzan8o6Cft5p5INdh/j2bHuwiV1C+PD/wK2vqx8d7Osh1v+bZnM 7II3mm6NJX5/omM1q9Lndd51O1h7TImlOCPRUIu5qDgRAMFpTAX4AgAA 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 If mmc_of_parse() is used, dw_mci_of_get_cd_gpio didn't need. Already implemented into mmc_of_parse(). Signed-off-by: Jaehoon Chung --- drivers/mmc/host/dw_mmc.c | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 1418d33..e776fdd 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -2048,26 +2048,6 @@ static int dw_mci_of_get_wp_gpio(struct device *dev, u8 slot) return gpio; } - -/* find the cd gpio for a given slot */ -static void dw_mci_of_get_cd_gpio(struct device *dev, u8 slot, - struct mmc_host *mmc) -{ - struct device_node *np = dw_mci_of_find_slot_node(dev, slot); - int gpio; - - if (!np) - return; - - gpio = of_get_named_gpio(np, "cd-gpios", 0); - - /* Having a missing entry is valid; return silently */ - if (!gpio_is_valid(gpio)) - return; - - if (mmc_gpio_request_cd(mmc, gpio, 0)) - dev_warn(dev, "gpio [%d] request failed\n", gpio); -} #else /* CONFIG_OF */ static int dw_mci_of_get_slot_quirks(struct device *dev, u8 slot) { @@ -2081,11 +2061,6 @@ static int dw_mci_of_get_wp_gpio(struct device *dev, u8 slot) { return -EINVAL; } -static void dw_mci_of_get_cd_gpio(struct device *dev, u8 slot, - struct mmc_host *mmc) -{ - return; -} #endif /* CONFIG_OF */ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id) @@ -2165,7 +2140,6 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id) } slot->wp_gpio = dw_mci_of_get_wp_gpio(host->dev, slot->id); - dw_mci_of_get_cd_gpio(host->dev, slot->id, mmc); ret = mmc_add_host(mmc); if (ret)