From patchwork Fri Dec 30 12:47:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 89340 Delivered-To: patches@linaro.org Received: by 10.140.20.101 with SMTP id 92csp6424607qgi; Fri, 30 Dec 2016 04:48:04 -0800 (PST) X-Received: by 10.46.76.26 with SMTP id z26mr17999582lja.9.1483102084731; Fri, 30 Dec 2016 04:48:04 -0800 (PST) Return-Path: Received: from mail-lf0-x236.google.com (mail-lf0-x236.google.com. [2a00:1450:4010:c07::236]) by mx.google.com with ESMTPS id 32si15775619lfs.83.2016.12.30.04.48.04 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Dec 2016 04:48:04 -0800 (PST) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 2a00:1450:4010:c07::236 as permitted sender) client-ip=2a00:1450:4010:c07::236; 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::236 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by mail-lf0-x236.google.com with SMTP id y21so236377589lfa.1 for ; Fri, 30 Dec 2016 04:48:04 -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=eM1NjHq9A+GVWKlY+TLPfLJIpOF2y0IUbKQ1lmgbHT4=; b=EsDNUCzbT5hVf4V5euK5L7GVYCILf55IF7hMIkmvU2iJm1uKhciuefGEBMs733my5g cmKmls6QpE/T7wHnLiN5BGwpH00r+D/FdTBdqS66wIOYbhYwKGr+omrc9+HfMsuZ6pGs TBxEgy2wTuHnCHYzjnPIEZ1Ed44gCqpuh2PcA= 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=eM1NjHq9A+GVWKlY+TLPfLJIpOF2y0IUbKQ1lmgbHT4=; b=OjuEpk+YLXZfnkX7tNDZ2iiNsGPigBblAVEqVDEkTocHlawb3f+vVefv7683LROK3Z J3JIWJkUPpcnLqZXLEeXpi82Whl0NQtM1IikkYVGCfGNyeE4fzjCkLGtpqRkYK3FILG5 9k7QL01oIundTAzan/WaeuxpOlxU/OMd+QPWxiJrM7iZACyJk+UXI4DQGs5zPTii6AJV uXIcnfR7Arbxlcr9wbkO2hsztslZksYfVnk/jA6fBTqeyOaQ9TtzzInJN+MwkXGbNj8V dEho5b4V2OZttThHTQGOSNnWFtdoYqt/+mmu3Gf0cfi2Ol014wFxyGIaAiiIHid9wQaz RAXA== X-Gm-Message-State: AIkVDXLjblGiTDA40fr5C+StfYXnnW/VIIo5i3/bg/82mFw+7sAoMQPRboXJjSFop6LFFMrEeYE= X-Received: by 10.25.56.80 with SMTP id d16mr16133149lfj.2.1483102084291; Fri, 30 Dec 2016 04:48:04 -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.48.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 30 Dec 2016 04:48:03 -0800 (PST) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson Cc: Jaehoon Chung , Adrian Hunter , Linus Walleij , Kuninori Morimoto Subject: [PATCH 06/21] mmc: sh_mmcif: Remove unused clk_ctrl2_present from the platform data Date: Fri, 30 Dec 2016 13:47:19 +0100 Message-Id: <1483102054-1752-7-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 clk_ctrl2_present member from the platform data, so let's remove it. Note, as some of the sh_mmcif variants may support clk_ctrl2, 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 9fa8ce3..4062d6b 100644 --- a/drivers/mmc/host/sh_mmcif.c +++ b/drivers/mmc/host/sh_mmcif.c @@ -1428,7 +1428,7 @@ static int sh_mmcif_probe(struct platform_device *pdev) host->addr = reg; host->timeout = msecs_to_jiffies(10000); host->ccs_enable = true; - host->clk_ctrl2_enable = pd && pd->clk_ctrl2_present; + host->clk_ctrl2_enable = false; host->pd = pdev; diff --git a/include/linux/mmc/sh_mmcif.h b/include/linux/mmc/sh_mmcif.h index 384b86b..a7baa29 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 clk_ctrl2_present : 1; u8 sup_pclk; /* 1 :SH7757, 0: SH7724/SH7372 */ unsigned long caps; u32 ocr;