Commit 21adc2e4 authored by Wolfram Sang's avatar Wolfram Sang Committed by Ulf Hansson
Browse files

mmc: Improve function name when aborting a tuning cmd 



'mmc_abort_tuning()' made me think tuning gets completely aborted.
However, it sends only a STOP cmd to cancel the current tuning cmd.
Tuning process may still continue after that. So, rename the function to
'mmc_send_abort_tuning()' to better reflect all this.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: default avatarNiklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Link: https://lore.kernel.org/r/20210608180620.40059-1-wsa+renesas@sang-engineering.com


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

drivers/mmc/core/mmc_ops.c

+2 −2
Original line number Diff line number Diff line
@@ -700,7 +700,7 @@ int mmc_send_tuning(struct mmc_host *host, u32 opcode, int *cmd_error) 
}

EXPORT_SYMBOL_GPL(mmc_send_tuning);



int mmc_abort_tuning(struct mmc_host *host, u32 opcode)

int mmc_send_abort_tuning(struct mmc_host *host, u32 opcode)

{

	struct mmc_command cmd = {};
@@ -723,7 +723,7 @@ int mmc_abort_tuning(struct mmc_host *host, u32 opcode) 


	return mmc_wait_for_cmd(host, &cmd, 0);

}

EXPORT_SYMBOL_GPL(mmc_abort_tuning);

EXPORT_SYMBOL_GPL(mmc_send_abort_tuning);



static int

mmc_send_bus_test(struct mmc_card *card, struct mmc_host *host, u8 opcode,

drivers/mmc/host/renesas_sdhi_core.c

+1 −1
Original line number Diff line number Diff line
@@ -704,7 +704,7 @@ static int renesas_sdhi_execute_tuning(struct mmc_host *mmc, u32 opcode) 
			set_bit(i, priv->smpcmp);



		if (cmd_error)

			mmc_abort_tuning(mmc, opcode);

			mmc_send_abort_tuning(mmc, opcode);

	}



	ret = renesas_sdhi_select_tuning(host);

drivers/mmc/host/sdhci.c

+1 −1
Original line number Diff line number Diff line
@@ -2680,7 +2680,7 @@ void sdhci_abort_tuning(struct sdhci_host *host, u32 opcode) 


	sdhci_end_tuning(host);



	mmc_abort_tuning(host->mmc, opcode);

	mmc_send_abort_tuning(host->mmc, opcode);

}

EXPORT_SYMBOL_GPL(sdhci_abort_tuning);

include/linux/mmc/host.h

+1 −1
Original line number Diff line number Diff line
@@ -632,6 +632,6 @@ static inline enum dma_data_direction mmc_get_dma_dir(struct mmc_data *data) 
}



int mmc_send_tuning(struct mmc_host *host, u32 opcode, int *cmd_error);

int mmc_abort_tuning(struct mmc_host *host, u32 opcode);

int mmc_send_abort_tuning(struct mmc_host *host, u32 opcode);



#endif /* LINUX_MMC_HOST_H */