Commit d0052ad9 authored by Michał Mirosław's avatar Michał Mirosław Committed by Ulf Hansson
Browse files

mmc: core: Remove mmc_gpiod_request_*(invert_gpio) 



Now that invert_gpio arguments are unused, let's remove them.

Signed-off-by: default avatarMichał Mirosław <mirq-linux@rere.qmqm.pl>
Link: https://lore.kernel.org/r/64d766d1f8af2e22bce32f4ffa453f7234207ad6.1576031637.git.mirq-linux@rere.qmqm.pl


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 0f7c815d

drivers/mmc/core/host.c

+2 −3
Original line number Diff line number Diff line
@@ -232,8 +232,7 @@ int mmc_of_parse(struct mmc_host *host) 
			host->caps |= MMC_CAP_NEEDS_POLL;



		ret = mmc_gpiod_request_cd(host, "cd", 0, false,

					   cd_debounce_delay_ms * 1000,

					   NULL);

					   cd_debounce_delay_ms * 1000);

		if (!ret)

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

		else if (ret != -ENOENT && ret != -ENOSYS)
@@ -245,7 +244,7 @@ int mmc_of_parse(struct mmc_host *host) 
	if (device_property_read_bool(dev, "wp-inverted"))

		host->caps2 |= MMC_CAP2_RO_ACTIVE_HIGH;



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

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

	if (!ret)

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

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

drivers/mmc/core/slot-gpio.c

+2 −13
Original line number Diff line number Diff line
@@ -160,8 +160,6 @@ EXPORT_SYMBOL(mmc_gpio_set_cd_isr); 
 * @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

 *

 * Note that this must be called prior to mmc_add_host()

 * otherwise the caller must also call mmc_gpiod_request_cd_irq().
@@ -170,7 +168,7 @@ EXPORT_SYMBOL(mmc_gpio_set_cd_isr); 
 */

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

			 unsigned int idx, bool override_active_level,

			 unsigned int debounce, bool *gpio_invert)

			 unsigned int debounce)

{

	struct mmc_gpio *ctx = host->slot.handler_priv;

	struct gpio_desc *desc;
@@ -194,9 +192,6 @@ int mmc_gpiod_request_cd(struct mmc_host *host, const char *con_id, 
	if (host->caps2 & MMC_CAP2_CD_ACTIVE_HIGH)

		gpiod_toggle_active_low(desc);



	if (gpio_invert)

		*gpio_invert = !gpiod_is_active_low(desc);



	ctx->cd_gpio = desc;



	return 0;
@@ -217,14 +212,11 @@ EXPORT_SYMBOL(mmc_can_gpio_cd); 
 * @con_id: function within the GPIO consumer

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

 * @debounce: debounce time in microseconds

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

 * set to NULL to ignore

 *

 * Returns zero on success, else an error.

 */

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

			 unsigned int idx,

			 unsigned int debounce, bool *gpio_invert)

			 unsigned int idx, unsigned int debounce)

{

	struct mmc_gpio *ctx = host->slot.handler_priv;

	struct gpio_desc *desc;
@@ -243,9 +235,6 @@ int mmc_gpiod_request_ro(struct mmc_host *host, const char *con_id, 
	if (host->caps2 & MMC_CAP2_RO_ACTIVE_HIGH)

		gpiod_toggle_active_low(desc);



	if (gpio_invert)

		*gpio_invert = !gpiod_is_active_low(desc);



	ctx->ro_gpio = desc;



	return 0;

drivers/mmc/host/davinci_mmc.c

+2 −2
Original line number Diff line number Diff line
@@ -1174,13 +1174,13 @@ static int mmc_davinci_parse_pdata(struct mmc_host *mmc) 
		mmc->caps |= pdata->caps;



	/* Register a cd gpio, if there is not one, enable polling */

	ret = mmc_gpiod_request_cd(mmc, "cd", 0, false, 0, NULL);

	ret = mmc_gpiod_request_cd(mmc, "cd", 0, false, 0);

	if (ret == -EPROBE_DEFER)

		return ret;

	else if (ret)

		mmc->caps |= MMC_CAP_NEEDS_POLL;



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

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

	if (ret == -EPROBE_DEFER)

		return ret;

drivers/mmc/host/mmc_spi.c

+2 −2
Original line number Diff line number Diff line
@@ -1426,7 +1426,7 @@ static int mmc_spi_probe(struct spi_device *spi) 
	 * Index 0 is card detect

	 * Old boardfiles were specifying 1 ms as debounce

	 */

	status = mmc_gpiod_request_cd(mmc, NULL, 0, false, 1000, NULL);

	status = mmc_gpiod_request_cd(mmc, NULL, 0, false, 1000);

	if (status == -EPROBE_DEFER)

		goto fail_add_host;

	if (!status) {
@@ -1441,7 +1441,7 @@ static int mmc_spi_probe(struct spi_device *spi) 
	mmc_detect_change(mmc, 0);



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

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

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

	if (status == -EPROBE_DEFER)

		goto fail_add_host;

	if (!status)

drivers/mmc/host/mmci.c

+2 −2
Original line number Diff line number Diff line
@@ -2054,11 +2054,11 @@ static int mmci_probe(struct amba_device *dev, 
	 * silently of these do not exist

	 */

	if (!np) {

		ret = mmc_gpiod_request_cd(mmc, "cd", 0, false, 0, NULL);

		ret = mmc_gpiod_request_cd(mmc, "cd", 0, false, 0);

		if (ret == -EPROBE_DEFER)

			goto clk_disable;



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

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

		if (ret == -EPROBE_DEFER)

			goto clk_disable;

	}