Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4180ffa8 authored by Adrian Hunter's avatar Adrian Hunter Committed by Ulf Hansson
Browse files

mmc: sdhci: Add sdhci_cleanup_host 



Add sdhci_cleanup_host() to cleanup __sdhci_add_host().

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Tested-by: default avatarLudovic Desroches <ludovic.desroches@microchip.com>
parent 15becf68

drivers/mmc/host/sdhci.c

+26 −11
Original line number Diff line number Diff line
@@ -3568,6 +3568,22 @@ int sdhci_setup_host(struct sdhci_host *host) 
}

EXPORT_SYMBOL_GPL(sdhci_setup_host);



void sdhci_cleanup_host(struct sdhci_host *host)

{

	struct mmc_host *mmc = host->mmc;



	if (!IS_ERR(mmc->supply.vqmmc))

		regulator_disable(mmc->supply.vqmmc);



	if (host->align_buffer)

		dma_free_coherent(mmc_dev(mmc), host->align_buffer_sz +

				  host->adma_table_sz, host->align_buffer,

				  host->align_addr);

	host->adma_table = NULL;

	host->align_buffer = NULL;

}

EXPORT_SYMBOL_GPL(sdhci_cleanup_host);



int __sdhci_add_host(struct sdhci_host *host)

{

	struct mmc_host *mmc = host->mmc;
@@ -3632,16 +3648,6 @@ int __sdhci_add_host(struct sdhci_host *host) 
untasklet:

	tasklet_kill(&host->finish_tasklet);



	if (!IS_ERR(mmc->supply.vqmmc))

		regulator_disable(mmc->supply.vqmmc);



	if (host->align_buffer)

		dma_free_coherent(mmc_dev(mmc), host->align_buffer_sz +

				  host->adma_table_sz, host->align_buffer,

				  host->align_addr);

	host->adma_table = NULL;

	host->align_buffer = NULL;



	return ret;

}

EXPORT_SYMBOL_GPL(__sdhci_add_host);
@@ -3654,7 +3660,16 @@ int sdhci_add_host(struct sdhci_host *host) 
	if (ret)

		return ret;



	return __sdhci_add_host(host);

	ret = __sdhci_add_host(host);

	if (ret)

		goto cleanup;



	return 0;



cleanup:

	sdhci_cleanup_host(host);



	return ret;

}

EXPORT_SYMBOL_GPL(sdhci_add_host);

drivers/mmc/host/sdhci.h

+1 −0
Original line number Diff line number Diff line
@@ -660,6 +660,7 @@ void sdhci_card_detect(struct sdhci_host *host); 
void __sdhci_read_caps(struct sdhci_host *host, u16 *ver, u32 *caps,

		       u32 *caps1);

int sdhci_setup_host(struct sdhci_host *host);

void sdhci_cleanup_host(struct sdhci_host *host);

int __sdhci_add_host(struct sdhci_host *host);

int sdhci_add_host(struct sdhci_host *host);

void sdhci_remove_host(struct sdhci_host *host, int dead);