From patchwork Tue Jan 28 08:24:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaehoon Chung X-Patchwork-Id: 3545661 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 9FFDBC02DC for ; Tue, 28 Jan 2014 08:24:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8677120138 for ; Tue, 28 Jan 2014 08:24:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 986C02015E for ; Tue, 28 Jan 2014 08:24:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754321AbaA1IYb (ORCPT ); Tue, 28 Jan 2014 03:24:31 -0500 Received: from mailout2.samsung.com ([203.254.224.25]:61891 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754471AbaA1IY3 (ORCPT ); Tue, 28 Jan 2014 03:24:29 -0500 Received: from epcpsbgr3.samsung.com (u143.gpu120.samsung.co.kr [203.254.230.143]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N0300LUCRCS6320@mailout2.samsung.com> for linux-mmc@vger.kernel.org; Tue, 28 Jan 2014 17:24:28 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.113]) by epcpsbgr3.samsung.com (EPCPMTA) with SMTP id DE.F7.10092.B3967E25; Tue, 28 Jan 2014 17:24:28 +0900 (KST) X-AuditID: cbfee68f-b7f156d00000276c-ec-52e7693bddba Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 3A.8E.28157.B3967E25; Tue, 28 Jan 2014 17:24:27 +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 <0N03000UHRCRI520@mmp2.samsung.com>; Tue, 28 Jan 2014 17:24:27 +0900 (KST) Message-id: <52E7695A.8070206@samsung.com> Date: Tue, 28 Jan 2014 17:24:58 +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 v2 7/8] 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+NgFmplkeLIzCtJLcpLzFFi42JZI2JSqGuT+TzI4FeyxYTL2xktjvzvZ7T4 cP8iswOzx41XC5k8+rasYvT4vEkugDmKyyYlNSezLLVI3y6BK2PK6Va2gsO8FZcbVzE3MLZz dzFyckgImEhM2vuaBcIWk7hwbz1bFyMXh5DAUkaJFa+uAzkcYEVbO5NBaoQEpjNK/HxtA1Hz mlGi7/UTJpAEr4CWxMvDvcwgNouAqsT1tZdZQWw2AR2J7d+Og9WICoRJTD1xlQWiXlDix+R7 LCDzRQSsJZp/y4KEmQXcJaZ8vMUOYgsLOEt8XPKDDSKuI7G/dRqULS+xec1bZpAbJATa2SU+ H5nIBrFXQOLb5EMsEDfLSmw6wAzxl6TEwRU3WCYwisxCsnkWkrGzkIxdwMi8ilE0tSC5oDgp vchYrzgxt7g0L10vOT93EyMwCk7/e9a/g/HuAetDjMlAKycyS4km5wOjKK8k3tDYzMjC1MTU 2Mjc0ow0YSVx3vsPk4KEBNITS1KzU1MLUovii0pzUosPMTJxcEo1MBazhOdWH438lOi3aUW8 4MF5PStXtOW0PmnjEG/7X9jJ/ks410U54pXZT5U1Rq1H7jbPtSx5+HSxxrxHn3x71iTXBAaV JXPLXms3mnyc/+zZIyJVH5jSF5bdl+2auGSmlXRR+lIL9VnFk98rPeNfF5PVFHdljYHwSsUz nx4f/cEd0blJMdT/rRJLcUaioRZzUXEiALwz/+SYAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrMIsWRmVeSWpSXmKPExsVy+t9jQV3rzOdBBicOmVlMuLyd0eLI/35G iw/3LzI7MHvceLWQyaNvyypGj8+b5AKYoxoYbTJSE1NSixRS85LzUzLz0m2VvIPjneNNzQwM dQ0tLcyVFPISc1NtlVx8AnTdMnOANikplCXmlAKFAhKLi5X07TBNCA1x07WAaYzQ9Q0Jgusx MkADCWsYM6acbmUrOMxbcblxFXMDYzt3FyMHh4SAicTWzuQuRk4gU0ziwr31bCC2kMB0Romf r226GLmA7NeMEn2vnzCBJHgFtCReHu5lBrFZBFQlrq+9zApiswnoSGz/dhysRlQgTGLqiass EPWCEj8m32MB2SUiYC3R/FsWJMws4C4x5eMtdhBbWMBZ4uOSH2wQcR2J/a3ToGx5ic1r3jJP YOSbhWTSLCRls5CULWBkXsUomlqQXFCclJ5rpFecmFtcmpeul5yfu4kRHGXPpHcwrmqwOMQo wMGoxMPbmPw8SIg1say4MvcQowQHs5II79kpz4KEeFMSK6tSi/Lji0pzUosPMSYDPTqRWUo0 OR+YAPJK4g2NTcyMLI3MDS2MjM1JE1YS5z3Yah0oJJCeWJKanZpakFoEs4WJg1OqgdEpOyvf rdRs99TVvVMuzptToO5imWEdUMeysueCmKr5t4Mv9R//FVv2w0vG+eUM97UNq/an6cl0xgtd mJrAf9TmYamE48pDFYUnsho1DqjvtDL5v9FQdOHr7NinO7oWM2hskPtV1itzb7U5Z/nnt/xz SopUGQVPTRdS995+cGowQ3ivvqPUBiWW4oxEQy3mouJEAGPaNeL2AgAA 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.4 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 947859f..983560d 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)