Commit a2b760a6 authored by Linus Walleij's avatar Linus Walleij Committed by Ulf Hansson
Browse files

mmc: slot-gpio: Remove override_active_level on WP 



The argument "override_active_level" made it possible to
enforce a specific polarity on the write-protect
GPIO line. All callers in the kernel pass "false" to this
call after I have converted all drivers to use GPIO machine
descriptors, so remove the argument and clean out this.

This kind of polarity inversion should be handled by the
GPIO descriptor inside the GPIO library if needed.

This rids us of one instance of the kludgy calls into
the gpiod_get_raw_value() API.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 9cda3e7c

drivers/mmc/core/host.c

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ int mmc_of_parse(struct mmc_host *host) 
	/* Parse Write Protection */

	ro_cap_invert = device_property_read_bool(dev, "wp-inverted");



	ret = mmc_gpiod_request_ro(host, "wp", 0, false, 0, &ro_gpio_invert);

	ret = mmc_gpiod_request_ro(host, "wp", 0, 0, &ro_gpio_invert);

	if (!ret)

		dev_info(host->parent, "Got WP GPIO\n");

	else if (ret != -ENOENT && ret != -ENOSYS)

drivers/mmc/core/slot-gpio.c

+1 −8
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
struct mmc_gpio {

	struct gpio_desc *ro_gpio;

	struct gpio_desc *cd_gpio;

	bool override_ro_active_level;

	bool override_cd_active_level;

	irqreturn_t (*cd_gpio_isr)(int irq, void *dev_id);

	char *ro_label;
@@ -71,10 +70,6 @@ int mmc_gpio_get_ro(struct mmc_host *host) 
	if (!ctx || !ctx->ro_gpio)

		return -ENOSYS;



	if (ctx->override_ro_active_level)

		return !gpiod_get_raw_value_cansleep(ctx->ro_gpio) ^

			!!(host->caps2 & MMC_CAP2_RO_ACTIVE_HIGH);



	return gpiod_get_value_cansleep(ctx->ro_gpio);

}

EXPORT_SYMBOL(mmc_gpio_get_ro);
@@ -225,7 +220,6 @@ EXPORT_SYMBOL(mmc_can_gpio_cd); 
 * @host: mmc host

 * @con_id: function within the GPIO consumer

 * @idx: index of the GPIO to obtain in the consumer

 * @override_active_level: ignore %GPIO_ACTIVE_LOW flag

 * @debounce: debounce time in microseconds

 * @gpio_invert: will return whether the GPIO line is inverted or not,

 * set to NULL to ignore
@@ -233,7 +227,7 @@ EXPORT_SYMBOL(mmc_can_gpio_cd); 
 * Returns zero on success, else an error.

 */

int mmc_gpiod_request_ro(struct mmc_host *host, const char *con_id,

			 unsigned int idx, bool override_active_level,

			 unsigned int idx,

			 unsigned int debounce, bool *gpio_invert)

{

	struct mmc_gpio *ctx = host->slot.handler_priv;
@@ -253,7 +247,6 @@ int mmc_gpiod_request_ro(struct mmc_host *host, const char *con_id, 
	if (gpio_invert)

		*gpio_invert = !gpiod_is_active_low(desc);



	ctx->override_ro_active_level = override_active_level;

	ctx->ro_gpio = desc;



	return 0;

drivers/mmc/host/davinci_mmc.c

+1 −1
Original line number Diff line number Diff line
@@ -1193,7 +1193,7 @@ static int mmc_davinci_parse_pdata(struct mmc_host *mmc) 
	else if (ret)

		mmc->caps |= MMC_CAP_NEEDS_POLL;



	ret = mmc_gpiod_request_ro(mmc, "wp", 0, false, 0, NULL);

	ret = mmc_gpiod_request_ro(mmc, "wp", 0, 0, NULL);

	if (ret == -EPROBE_DEFER)

		return ret;

drivers/mmc/host/mmc_spi.c

+1 −1
Original line number Diff line number Diff line
@@ -1452,7 +1452,7 @@ static int mmc_spi_probe(struct spi_device *spi) 
	}



	/* Index 1 is write protect/read only */

	status = mmc_gpiod_request_ro(mmc, NULL, 1, false, 0, NULL);

	status = mmc_gpiod_request_ro(mmc, NULL, 1, 0, NULL);

	if (status == -EPROBE_DEFER)

		goto fail_add_host;

	if (!status)

drivers/mmc/host/mmci.c

+1 −1
Original line number Diff line number Diff line
@@ -2011,7 +2011,7 @@ static int mmci_probe(struct amba_device *dev, 
		if (ret == -EPROBE_DEFER)

			goto clk_disable;



		ret = mmc_gpiod_request_ro(mmc, "wp", 0, false, 0, NULL);

		ret = mmc_gpiod_request_ro(mmc, "wp", 0, 0, NULL);

		if (ret == -EPROBE_DEFER)

			goto clk_disable;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE