Commit 64982b9f authored by Wolfram Sang's avatar Wolfram Sang Committed by Ulf Hansson
Browse files

mmc: tmio: give callback a generic name 



check_scc_error() is too Renesas specific. Let's just call it
check_retune() to make it also easier understandable what it does.
Only a rename, no functional change.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: default avatarNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Reviewed-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Link: https://lore.kernel.org/r/20200129203709.30493-4-wsa+renesas@sang-engineering.com


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

drivers/mmc/host/renesas_sdhi_core.c

+1 −1
Original line number Diff line number Diff line
@@ -899,7 +899,7 @@ int renesas_sdhi_probe(struct platform_device *pdev, 


		host->execute_tuning = renesas_sdhi_execute_tuning;

		host->select_tuning = renesas_sdhi_select_tuning;

		host->check_scc_error = renesas_sdhi_check_scc_error;

		host->check_retune = renesas_sdhi_check_scc_error;

		host->prepare_hs400_tuning =

			renesas_sdhi_prepare_hs400_tuning;

		host->hs400_downgrade = renesas_sdhi_disable_scc;

drivers/mmc/host/tmio_mmc.h

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ struct tmio_mmc_host { 
	int (*write16_hook)(struct tmio_mmc_host *host, int addr);

	void (*reset)(struct tmio_mmc_host *host);

	void (*hw_reset)(struct tmio_mmc_host *host);

	bool (*check_scc_error)(struct tmio_mmc_host *host);

	bool (*check_retune)(struct tmio_mmc_host *host);



	/*

	 * Mandatory callback for tuning to occur which is optional for SDR50

drivers/mmc/host/tmio_mmc_core.c

+2 −2
Original line number Diff line number Diff line
@@ -818,8 +818,8 @@ static void tmio_mmc_finish_request(struct tmio_mmc_host *host) 
	if (mrq->cmd->error || (mrq->data && mrq->data->error))

		tmio_mmc_abort_dma(host);



	/* SCC error means retune, but executed command was still successful */

	if (host->check_scc_error && host->check_scc_error(host))

	/* Error means retune, but executed command was still successful */

	if (host->check_retune && host->check_retune(host))

		mmc_retune_needed(host->mmc);



	/* If SET_BLOCK_COUNT, continue with main command */