From patchwork Fri Dec 30 12:47:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 89339 Delivered-To: patches@linaro.org Received: by 10.140.20.101 with SMTP id 92csp6424589qgi; Fri, 30 Dec 2016 04:48:02 -0800 (PST) X-Received: by 10.25.152.142 with SMTP id a136mr12884218lfe.113.1483102081720; Fri, 30 Dec 2016 04:48:01 -0800 (PST) Return-Path: Received: from mail-lf0-x231.google.com (mail-lf0-x231.google.com. [2a00:1450:4010:c07::231]) by mx.google.com with ESMTPS id 28si15536787lfr.419.2016.12.30.04.48.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Dec 2016 04:48:01 -0800 (PST) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 2a00:1450:4010:c07::231 as permitted sender) client-ip=2a00:1450:4010:c07::231; 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::231 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by mail-lf0-x231.google.com with SMTP id c13so236665797lfg.0 for ; Fri, 30 Dec 2016 04:48:01 -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=tb5YhwtJLQJXZFyFc9bOOKy+v0wNo0j6U9uI3D5JHyw=; b=X8Q4n8x0Vk8FEBMLG690fdZ1NoLr1chSqWrK5mUAVPgjDqczzoHRYXOLnSJQh2Tnou p3OnK4cb8c4JkUw7D5uCsDIErUOoMyCqH4tBkjTCfqDpycvHCA6OkNBpJrj7aPDLft6M e7N/8BEPwESsprx97onV52JXtloGvzI6pxjww= 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=tb5YhwtJLQJXZFyFc9bOOKy+v0wNo0j6U9uI3D5JHyw=; b=TwZGFiAhaM+YOvSIqmWLnBd26Tpt3+PHSBNWai4N8WMHzx0mTKY6HUbucucjiUk+Dt 2OgX0Z1/t82Gp6lB/rJYr472yT/td8CCsejdmG9Wi4yxzDEQOobdyguN16JvfbZb6cdy 3G8Qg2YYyG3k8wjfY9dEyS2IYkrUXWecIkvLnXoTT5ttsSYJGi3HPvRWunQDQ63lNKIC mAHHWU+jAu0GdtOkLpskarO9XW5I54PBWZQmcMcgmvdKHONd2hYjeagjf1sYl8t7k8XO /tdPwNZ0YNBZFz6LE62jvF0YVdWyomn59/YRVC33+tBwKvoCj6kf/VjgK9nkw2E421IN e4YA== X-Gm-Message-State: AIkVDXJR5Wfhmx/CC5CwgqzJNM5UoDOb4Cdr7K185CzpcI5WRBzGWbRuIuBk9DaUcPRtqCrVh9o= X-Received: by 10.25.32.9 with SMTP id g9mr11270543lfg.142.1483102081323; Fri, 30 Dec 2016 04:48:01 -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.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 30 Dec 2016 04:48:00 -0800 (PST) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson Cc: Jaehoon Chung , Adrian Hunter , Linus Walleij , Kuninori Morimoto Subject: [PATCH 05/21] mmc: sh_mmcif: Remove unused ccs_unsupported from the platform data Date: Fri, 30 Dec 2016 13:47:18 +0100 Message-Id: <1483102054-1752-6-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> There are currently no users of the ccs_unsupported member from the platform data, so let's remove it. Note, as some of the sh_mmcif variants may not support ccs, let's keep the current code in the driver, which deals with this. For future support, we should invent a DT binding instead, but let's leave that until it's needed. Cc: Kuninori Morimoto Signed-off-by: Ulf Hansson --- drivers/mmc/host/sh_mmcif.c | 2 +- include/linux/mmc/sh_mmcif.h | 1 - 2 files changed, 1 insertion(+), 2 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 7ba92a4..9fa8ce3 100644 --- a/drivers/mmc/host/sh_mmcif.c +++ b/drivers/mmc/host/sh_mmcif.c @@ -1427,7 +1427,7 @@ static int sh_mmcif_probe(struct platform_device *pdev) host->mmc = mmc; host->addr = reg; host->timeout = msecs_to_jiffies(10000); - host->ccs_enable = !pd || !pd->ccs_unsupported; + host->ccs_enable = true; host->clk_ctrl2_enable = pd && pd->clk_ctrl2_present; host->pd = pdev; diff --git a/include/linux/mmc/sh_mmcif.h b/include/linux/mmc/sh_mmcif.h index 7cafc95..384b86b 100644 --- a/include/linux/mmc/sh_mmcif.h +++ b/include/linux/mmc/sh_mmcif.h @@ -34,7 +34,6 @@ struct sh_mmcif_plat_data { unsigned int slave_id_tx; /* embedded slave_id_[tr]x */ unsigned int slave_id_rx; - bool ccs_unsupported : 1; bool clk_ctrl2_present : 1; u8 sup_pclk; /* 1 :SH7757, 0: SH7724/SH7372 */ unsigned long caps;