Commit 2e1a26ed authored by Wolfram Sang's avatar Wolfram Sang Committed by Ulf Hansson
Browse files

mmc: rename mmc_can_gpio_ro() to mmc_host_can_gpio_ro() 



mmc_can_* functions sometimes relate to the card and sometimes to the host.
Make it obvious by renaming this function to include 'host'.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/20250401095847.29271-12-wsa+renesas@sang-engineering.com


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

drivers/mmc/core/slot-gpio.c

+2 −2
Original line number Diff line number Diff line
@@ -275,10 +275,10 @@ int mmc_gpiod_request_ro(struct mmc_host *host, const char *con_id, 
}

EXPORT_SYMBOL(mmc_gpiod_request_ro);



bool mmc_can_gpio_ro(struct mmc_host *host)

bool mmc_host_can_gpio_ro(struct mmc_host *host)

{

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



	return ctx->ro_gpio ? true : false;

}

EXPORT_SYMBOL(mmc_can_gpio_ro);
 
EXPORT_SYMBOL(mmc_host_can_gpio_ro);

drivers/mmc/host/renesas_sdhi_core.c

+1 −1
Original line number Diff line number Diff line
@@ -1112,7 +1112,7 @@ int renesas_sdhi_probe(struct platform_device *pdev, 
		host->mmc->caps2 &= ~(MMC_CAP2_HS400 | MMC_CAP2_HS400_ES);



	/* For some SoC, we disable internal WP. GPIO may override this */

	if (mmc_can_gpio_ro(host->mmc))

	if (mmc_host_can_gpio_ro(host->mmc))

		mmc_data->capabilities2 &= ~MMC_CAP2_NO_WRITE_PROTECT;



	/* SDR speeds are only available on Gen2+ */

drivers/mmc/host/sdhci-omap.c

+1 −1
Original line number Diff line number Diff line
@@ -1270,7 +1270,7 @@ static int sdhci_omap_probe(struct platform_device *pdev) 
			mmc->f_max = 48000000;

	}



	if (!mmc_can_gpio_ro(mmc))

	if (!mmc_host_can_gpio_ro(mmc))

		mmc->caps2 |= MMC_CAP2_NO_WRITE_PROTECT;



	pltfm_host->clk = devm_clk_get(dev, "fck");

drivers/mmc/host/sdhci.c

+1 −1
Original line number Diff line number Diff line
@@ -2571,7 +2571,7 @@ int sdhci_get_ro(struct mmc_host *mmc) 
		is_readonly = 0;

	} else if (host->ops->get_ro) {

		is_readonly = host->ops->get_ro(host);

	} else if (mmc_can_gpio_ro(mmc)) {

	} else if (mmc_host_can_gpio_ro(mmc)) {

		is_readonly = mmc_gpio_get_ro(mmc);

		/* Do not invert twice */

		allow_invert = !(mmc->caps2 & MMC_CAP2_RO_ACTIVE_HIGH);

drivers/mmc/host/tmio_mmc_core.c

+1 −1
Original line number Diff line number Diff line
@@ -1176,7 +1176,7 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host) 
				  dma_max_mapping_size(&pdev->dev));

	mmc->max_seg_size = mmc->max_req_size;



	if (mmc_can_gpio_ro(mmc))

	if (mmc_host_can_gpio_ro(mmc))

		_host->ops.get_ro = mmc_gpio_get_ro;



	if (mmc_host_can_gpio_cd(mmc))