From patchwork Mon Feb 3 11:15:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaehoon Chung X-Patchwork-Id: 3568871 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 A899CC02DD for ; Mon, 3 Feb 2014 11:15:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6833720200 for ; Mon, 3 Feb 2014 11:15:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7F6A2201C0 for ; Mon, 3 Feb 2014 11:15:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750764AbaBCLPm (ORCPT ); Mon, 3 Feb 2014 06:15:42 -0500 Received: from mailout4.samsung.com ([203.254.224.34]:49506 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751344AbaBCLPk (ORCPT ); Mon, 3 Feb 2014 06:15:40 -0500 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 <0N0F006DJ3A3V0C0@mailout4.samsung.com> for linux-mmc@vger.kernel.org; Mon, 03 Feb 2014 20:15:39 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.115]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id 28.A1.14803.A5A7FE25; Mon, 03 Feb 2014 20:15:39 +0900 (KST) X-AuditID: cbfee691-b7efc6d0000039d3-ba-52ef7a5a1b08 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 9A.80.28157.A5A7FE25; Mon, 03 Feb 2014 20:15:38 +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 <0N0F0011T3A21350@mmp1.samsung.com>; Mon, 03 Feb 2014 20:15:38 +0900 (KST) Message-id: <52EF7A5A.1090908@samsung.com> Date: Mon, 03 Feb 2014 20:15:38 +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 v3 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+NgFmpjkeLIzCtJLcpLzFFi42JZI2JSrBtd9T7I4JusxYTL2xktjvzvZ7T4 cP8iswOzx41XC5k8+rasYvT4vEkugDmKyyYlNSezLLVI3y6BK2PV35PMBXd4Kw5c+s7SwDiD u4uRk0NCwETi3ar17BC2mMSFe+vZuhi5OIQEljJK/Jywm6WLkQOsqKmpFCK+iFFi1qp9zBDO a0aJqb9vsYB08wpoSZw9/wbMZhFQlXh+5h3YVDYBHYnt344zgdiiAmESU09chaoXlPgx+R7Y AhEBa4nm37IgYWYBd4kpH2+BtQoLOEusfLqWBSKuI7G/dRobhC0vsXnNW7AbJAS62SU+39/P BLFXQOLb5ENQR8tKbDrADPGYpMTBFTdYJjCKzEKyeRaSsbOQjF3AyLyKUTS1ILmgOCm9yFSv ODG3uDQvXS85P3cTIzAOTv97NnEH4/0D1ocYk4FWTmSWEk3OB8ZRXkm8obGZkYWpiamxkbml GWnCSuK86Y+SgoQE0hNLUrNTUwtSi+KLSnNSiw8xMnFwSjUwbmq5VD8t9kerU9flo0oNOhmL X1kxvpa0CZl0OTQ4+WSZc7vQe4GtyRPe2e6cOlE0b05ha7VbbO9Or8pVL59PfPQ4vHDD/106 QRcubbfQqCzrzX1Q0nFB2/d25pKk3Nxkja37ew17jHkZzz85K+JsJnIgr784SPH2lxurDSe9 mdI67XH1kxn7lViKMxINtZiLihMBVI/Wg5kCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrCIsWRmVeSWpSXmKPExsVy+t9jAd2oqvdBBqfPmFlMuLyd0eLI/35G iw/3LzI7MHvceLWQyaNvyypGj8+b5AKYoxoYbTJSE1NSixRS85LzUzLz0m2VvIPjneNNzQwM dQ0tLcyVFPISc1NtlVx8AnTdMnOANikplCXmlAKFAhKLi5X07TBNCA1x07WAaYzQ9Q0Jgusx MkADCWsYM1b9PclccIe34sCl7ywNjDO4uxg5OCQETCSamkq7GDmBTDGJC/fWs3UxcnEICSxi lJi1ah8zhPOaUWLq71ssIFW8AloSZ8+/AbNZBFQlnp95xw5iswnoSGz/dpwJxBYVCJOYeuIq VL2gxI/J91hAlokIWEs0/5YFCTMLuEtM+XgLrFVYwFli5dO1LBBxHYn9rdPYIGx5ic1r3jJP YOSbhWTSLCRls5CULWBkXsUomlqQXFCclJ5rpFecmFtcmpeul5yfu4kRHGfPpHcwrmqwOMQo wMGoxMPbsfddkBBrYllxZe4hRgkOZiUR3r0V74OEeFMSK6tSi/Lji0pzUosPMSYDPTqRWUo0 OR+YAvJK4g2NTcyMLI3MDS2MjM1JE1YS5z3Yah0oJJCeWJKanZpakFoEs4WJg1OqgVHrQdcq lg7tB3t3LVtWYJI5T8DHeq5oyjrFnqjk3OYv9XuvPrzomnOSN5pVXF77sfi9Yq4wvyf8ngnX HxhGfpRc8WmZyKSQ/ssb82Q6d/k43FnNNWvxBCGJzd8nVHx7d2P3g8PCZsrZy3ZcOLMp+mBK pOH/VOOvifeSnthlZHSV9Fc6trtMOavEUpyRaKjFXFScCAAJ1yru9wIAAA== 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 --- Changelog V3: -None 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 2f40593..ac2907d 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)