Commit 2caa11bc authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Ulf Hansson
Browse files

mmc: sdhci: Deduplicate sdhci_get_cd_nogpio() 



The analogue of the sdhci_get_cd_nogpio() is used in the sdhci-pci-core
and sdhci-acpi modules. Deduplicate it by moving to sdhci and exporting.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Link: https://lore.kernel.org/r/20211014132613.27861-2-andriy.shevchenko@linux.intel.com


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

drivers/mmc/host/sdhci-acpi.c

+1 −13
Original line number Diff line number Diff line
@@ -362,23 +362,11 @@ static inline bool sdhci_acpi_no_fixup_child_power(struct acpi_device *adev) 
static int bxt_get_cd(struct mmc_host *mmc)

{

	int gpio_cd = mmc_gpio_get_cd(mmc);

	struct sdhci_host *host = mmc_priv(mmc);

	unsigned long flags;

	int ret = 0;



	if (!gpio_cd)

		return 0;



	spin_lock_irqsave(&host->lock, flags);



	if (host->flags & SDHCI_DEVICE_DEAD)

		goto out;



	ret = !!(sdhci_readl(host, SDHCI_PRESENT_STATE) & SDHCI_CARD_PRESENT);

out:

	spin_unlock_irqrestore(&host->lock, flags);



	return ret;

	return sdhci_get_cd_nogpio(mmc);

}



static int intel_probe_slot(struct platform_device *pdev, struct acpi_device *adev)

drivers/mmc/host/sdhci-pci-core.c

+0 −18
Original line number Diff line number Diff line
@@ -616,24 +616,6 @@ static int intel_select_drive_strength(struct mmc_card *card, 
	return intel_host->drv_strength;

}



static int sdhci_get_cd_nogpio(struct mmc_host *mmc)

{

	struct sdhci_host *host = mmc_priv(mmc);

	unsigned long flags;

	int ret = 0;



	spin_lock_irqsave(&host->lock, flags);



	if (host->flags & SDHCI_DEVICE_DEAD)

		goto out;



	ret = !!(sdhci_readl(host, SDHCI_PRESENT_STATE) & SDHCI_CARD_PRESENT);

out:

	spin_unlock_irqrestore(&host->lock, flags);



	return ret;

}



static int bxt_get_cd(struct mmc_host *mmc)

{

	int gpio_cd = mmc_gpio_get_cd(mmc);

drivers/mmc/host/sdhci.c

+19 −0
Original line number Diff line number Diff line
@@ -2425,6 +2425,25 @@ static int sdhci_get_cd(struct mmc_host *mmc) 
	return !!(sdhci_readl(host, SDHCI_PRESENT_STATE) & SDHCI_CARD_PRESENT);

}



int sdhci_get_cd_nogpio(struct mmc_host *mmc)

{

	struct sdhci_host *host = mmc_priv(mmc);

	unsigned long flags;

	int ret = 0;



	spin_lock_irqsave(&host->lock, flags);



	if (host->flags & SDHCI_DEVICE_DEAD)

		goto out;



	ret = !!(sdhci_readl(host, SDHCI_PRESENT_STATE) & SDHCI_CARD_PRESENT);

out:

	spin_unlock_irqrestore(&host->lock, flags);



	return ret;

}

EXPORT_SYMBOL_GPL(sdhci_get_cd_nogpio);



static int sdhci_check_ro(struct sdhci_host *host)

{

	unsigned long flags;

drivers/mmc/host/sdhci.h

+1 −0
Original line number Diff line number Diff line
@@ -775,6 +775,7 @@ void sdhci_set_power_and_bus_voltage(struct sdhci_host *host, 
				     unsigned short vdd);

void sdhci_set_power_noreg(struct sdhci_host *host, unsigned char mode,

			   unsigned short vdd);

int sdhci_get_cd_nogpio(struct mmc_host *mmc);

void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq);

int sdhci_request_atomic(struct mmc_host *mmc, struct mmc_request *mrq);

void sdhci_set_bus_width(struct sdhci_host *host, int width);