From patchwork Fri Dec 30 12:47:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 89337 Delivered-To: patches@linaro.org Received: by 10.140.20.101 with SMTP id 92csp6424551qgi; Fri, 30 Dec 2016 04:47:55 -0800 (PST) X-Received: by 10.25.130.149 with SMTP id e143mr16194598lfd.87.1483102075842; Fri, 30 Dec 2016 04:47:55 -0800 (PST) Return-Path: Received: from mail-lf0-x234.google.com (mail-lf0-x234.google.com. [2a00:1450:4010:c07::234]) by mx.google.com with ESMTPS id y11si16769091lff.93.2016.12.30.04.47.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Dec 2016 04:47:55 -0800 (PST) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 2a00:1450:4010:c07::234 as permitted sender) client-ip=2a00:1450:4010:c07::234; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 2a00:1450:4010:c07::234 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by mail-lf0-x234.google.com with SMTP id y21so236375926lfa.1 for ; Fri, 30 Dec 2016 04:47:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=f3PDMXDC66AVeONea37cFTQzvF0xDNmPZvN1ooSbjJ8=; b=WtuMYL0+d8DekhHVGJuwyQmMGvMnCJEDfkpiEhmK5WV1miDxxtCI4mLroatx6GJl6A pewJYjtBHcMR2C9bZWjOVLdDUtWGhZLlQcvSsfV67S/XSMywrvKCPpwti6KDiz1Dt8hj Wc0z/bJg9W0IUxsoZIB4lJmatJvM9rgJULJJY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=f3PDMXDC66AVeONea37cFTQzvF0xDNmPZvN1ooSbjJ8=; b=t+aL8kCKQ5eo1r11aPX6y/T+9I37Rm6FYMJ6TIsvWvLDvoFgFS8EymGtiWEo3G+eeW 0QjXDWTVeaHyvkrAxOyiJ4lq1Mq22U1s/fHJzgNk9au/bfKcYV7wlE/vvhqelUvzPzcN gw3wRt/3znvWoU+QgApX9SCiDCRSligsxqC/YsdnQ/3b6gzVb75fu8MsJ/IG/ErTNimY 4qGd2D5nI4cIPEgPOPGN/DQR3ON86AyNIuQQ3Q81YdLnxkXTCu53N1v2sHR/K06Me98c 6DrO03acXCi5Gj96KeTlHod+i8kO5rzPjaJcCfGHv0Bg8Okg1xUfmsW1c0zej3QldpDe nSuw== X-Gm-Message-State: AIkVDXJN0UObpg+PUWyoNgPqTZcfCGmgFiGboHLwoWed+53RbZH4avUbBql/rGeNv9yVgCdAua8= X-Received: by 10.25.19.170 with SMTP id 42mr13611028lft.174.1483102075444; Fri, 30 Dec 2016 04:47:55 -0800 (PST) Return-Path: Received: from localhost.localdomain (h-155-4-221-67.na.cust.bahnhof.se. [155.4.221.67]) by smtp.gmail.com with ESMTPSA id a79sm7450069ljb.46.2016.12.30.04.47.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 30 Dec 2016 04:47:54 -0800 (PST) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson Cc: Jaehoon Chung , Adrian Hunter , Linus Walleij , Kuninori Morimoto Subject: [PATCH 03/21] mmc: sh_mmcif: Remove unused use_cd_gpio/cd_gpio from platform data Date: Fri, 30 Dec 2016 13:47:16 +0100 Message-Id: <1483102054-1752-4-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1483102054-1752-1-git-send-email-ulf.hansson@linaro.org> References: <1483102054-1752-1-git-send-email-ulf.hansson@linaro.org> Cc: Kuninori Morimoto Signed-off-by: Ulf Hansson --- drivers/mmc/host/sh_mmcif.c | 6 ------ include/linux/mmc/sh_mmcif.h | 2 -- 2 files changed, 8 deletions(-) -- 1.9.1 Reviewed-by: Linus Walleij diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c index 9007784..5f97055 100644 --- a/drivers/mmc/host/sh_mmcif.c +++ b/drivers/mmc/host/sh_mmcif.c @@ -1509,12 +1509,6 @@ static int sh_mmcif_probe(struct platform_device *pdev) } } - if (pd && pd->use_cd_gpio) { - ret = mmc_gpio_request_cd(mmc, pd->cd_gpio, 0); - if (ret < 0) - goto err_clk; - } - mutex_init(&host->thread_lock); ret = mmc_add_host(mmc); diff --git a/include/linux/mmc/sh_mmcif.h b/include/linux/mmc/sh_mmcif.h index ccd8fb2..5ce5a2c 100644 --- a/include/linux/mmc/sh_mmcif.h +++ b/include/linux/mmc/sh_mmcif.h @@ -35,10 +35,8 @@ struct sh_mmcif_plat_data { int (*get_cd)(struct platform_device *pdef); unsigned int slave_id_tx; /* embedded slave_id_[tr]x */ unsigned int slave_id_rx; - bool use_cd_gpio : 1; bool ccs_unsupported : 1; bool clk_ctrl2_present : 1; - unsigned int cd_gpio; u8 sup_pclk; /* 1 :SH7757, 0: SH7724/SH7372 */ unsigned long caps; u32 ocr;