[3/7] mmc: of_mmc_spi: Convert to mmc_of_parse_voltage()

Message ID	20190213195443.18935-4-ulf.hansson@linaro.org
State	New
Headers	show Delivered-To: patches@linaro.org Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; From: Ulf Hansson <ulf.hansson@linaro.org> To: linux-mmc@vger.kernel.org, Adrian Hunter <adrian.hunter@intel.com> Cc: Ulf Hansson <ulf.hansson@linaro.org> Subject: [PATCH 3/7] mmc: of_mmc_spi: Convert to mmc_of_parse_voltage() Date: Wed, 13 Feb 2019 20:54:39 +0100 Message-Id: <20190213195443.18935-4-ulf.hansson@linaro.org> In-Reply-To: <20190213195443.18935-1-ulf.hansson@linaro.org> References: <20190213195443.18935-1-ulf.hansson@linaro.org>
Series	mmc: core: Various minor cleanups \| expand [0/7] mmc: core: Various minor cleanups [1/7] mmc: core: Convert mmc_wait_for_app_cmd() to static [2/7] mmc: core: Drop retries as in-parameter to mmc_wait_for_app_cmd() [3/7] mmc: of_mmc_spi: Convert to mmc_of_parse_voltage() [4/7] mmc: core: Move regulator helpers to separate file [5/7] mmc: core: Convert mmc_regulator_get_ocrmask() to static [6/7] mmc: core: Move mmc_of_parse_voltage() to host.c [7/7] mmc: core: Convert mmc_align_data_size() into an SDIO specific function

Message ID

20190213195443.18935-4-ulf.hansson@linaro.org

State

New

Headers

Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates
	209.85.220.65 as permitted sender) client-ip=209.85.220.65; 
From: Ulf Hansson <ulf.hansson@linaro.org>
To: linux-mmc@vger.kernel.org,
	Adrian Hunter <adrian.hunter@intel.com>
Cc: Ulf Hansson <ulf.hansson@linaro.org>
Subject: [PATCH 3/7] mmc: of_mmc_spi: Convert to mmc_of_parse_voltage()
Date: Wed, 13 Feb 2019 20:54:39 +0100
Message-Id: <20190213195443.18935-4-ulf.hansson@linaro.org>
In-Reply-To: <20190213195443.18935-1-ulf.hansson@linaro.org>
References: <20190213195443.18935-1-ulf.hansson@linaro.org>

Series

mmc: core: Various minor cleanups | expand

Commit Message

Ulf Hansson Feb. 13, 2019, 7:54 p.m. UTC

Let's drop the open-coding of the parsing of the "voltage-ranges" DT
property and convert to use the common mmc_of_parse_voltage() API instead.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

---
 drivers/mmc/host/of_mmc_spi.c | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

-- 
2.17.1

diff --git a/drivers/mmc/host/of_mmc_spi.c b/drivers/mmc/host/of_mmc_spi.c
index b294b221f225..8a274b91804e 100644
--- a/drivers/mmc/host/of_mmc_spi.c
+++ b/drivers/mmc/host/of_mmc_spi.c
@@ -61,9 +61,6 @@  struct mmc_spi_platform_data *mmc_spi_get_pdata(struct spi_device *spi)
 	struct device *dev = &spi->dev;
 	struct device_node *np = dev->of_node;
 	struct of_mmc_spi *oms;
-	const __be32 *voltage_ranges;
-	int num_ranges;
-	int i;
 
 	if (dev->platform_data || !np)
 		return dev->platform_data;
@@ -72,25 +69,8 @@  struct mmc_spi_platform_data *mmc_spi_get_pdata(struct spi_device *spi)
 	if (!oms)
 		return NULL;
 
-	voltage_ranges = of_get_property(np, "voltage-ranges", &num_ranges);
-	num_ranges = num_ranges / sizeof(*voltage_ranges) / 2;
-	if (!voltage_ranges || !num_ranges) {
-		dev_err(dev, "OF: voltage-ranges unspecified\n");
+	if (mmc_of_parse_voltage(np, &oms->pdata.ocr_mask) <= 0)
 		goto err_ocr;
-	}
-
-	for (i = 0; i < num_ranges; i++) {
-		const int j = i * 2;
-		u32 mask;
-
-		mask = mmc_vddrange_to_ocrmask(be32_to_cpu(voltage_ranges[j]),
-					       be32_to_cpu(voltage_ranges[j + 1]));
-		if (!mask) {
-			dev_err(dev, "OF: voltage-range #%d is invalid\n", i);
-			goto err_ocr;
-		}
-		oms->pdata.ocr_mask |= mask;
-	}
 
 	oms->detect_irq = irq_of_parse_and_map(np, 0);
 	if (oms->detect_irq != 0) {

[3/7] mmc: of_mmc_spi: Convert to mmc_of_parse_voltage()

Commit Message

Patch