Commit 7d76ed77 authored by Faiz Abbas's avatar Faiz Abbas Committed by Ulf Hansson
Browse files

mmc: sdhci: Refactor sdhci_set_timeout() 



Refactor sdhci_set_timeout() such that platform drivers can do some
functionality in a set_timeout() callback and then call
__sdhci_set_timeout() to complete the operation.

Signed-off-by: default avatarFaiz Abbas <faiz_abbas@ti.com>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Link: https://lore.kernel.org/r/20200116105154.7685-7-faiz_abbas@ti.com


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

drivers/mmc/host/sdhci.c

+19 −17
Original line number Diff line number Diff line
@@ -1004,16 +1004,10 @@ void sdhci_set_data_timeout_irq(struct sdhci_host *host, bool enable) 
}

EXPORT_SYMBOL_GPL(sdhci_set_data_timeout_irq);



static void sdhci_set_timeout(struct sdhci_host *host, struct mmc_command *cmd)

void __sdhci_set_timeout(struct sdhci_host *host, struct mmc_command *cmd)

{

	u8 count;



	if (host->ops->set_timeout) {

		host->ops->set_timeout(host, cmd);

	} else {

	bool too_big = false;



		count = sdhci_calc_timeout(host, cmd, &too_big);

	u8 count = sdhci_calc_timeout(host, cmd, &too_big);



	if (too_big &&

	    host->quirks2 & SDHCI_QUIRK2_DISABLE_HW_TIMEOUT) {
@@ -1025,6 +1019,14 @@ static void sdhci_set_timeout(struct sdhci_host *host, struct mmc_command *cmd) 


	sdhci_writeb(host, count, SDHCI_TIMEOUT_CONTROL);

}

EXPORT_SYMBOL_GPL(__sdhci_set_timeout);



static void sdhci_set_timeout(struct sdhci_host *host, struct mmc_command *cmd)

{

	if (host->ops->set_timeout)

		host->ops->set_timeout(host, cmd);

	else

		__sdhci_set_timeout(host, cmd);

}



static void sdhci_initialize_data(struct sdhci_host *host,

drivers/mmc/host/sdhci.h

+1 −0
Original line number Diff line number Diff line
@@ -804,5 +804,6 @@ void sdhci_send_tuning(struct sdhci_host *host, u32 opcode); 
void sdhci_abort_tuning(struct sdhci_host *host, u32 opcode);

void sdhci_switch_external_dma(struct sdhci_host *host, bool en);

void sdhci_set_data_timeout_irq(struct sdhci_host *host, bool enable);

void __sdhci_set_timeout(struct sdhci_host *host, struct mmc_command *cmd);



#endif /* __SDHCI_HW_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE