mmc: sdhci: further code simplication (fce14421) · Commits · 戴 / test

Further simplify the code in sdhci_prepare_data() - we don't set SDHCI_REQ_USE_DMA anywhere else in the driver, so there is no need to set it, and then immediately test it. Signed-off-by:

Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by:

Adrian Hunter <adrian.hunter@intel.com> Tested-by:

Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by:

Ulf Hansson <ulf.hansson@linaro.org>

drivers/mmc/host/sdhci.c

+10 −11

Original line number	Diff line number	Diff line
		@@ -725,7 +725,11 @@ static void sdhci_prepare_data(struct sdhci_host host, struct mmc_command cmd)
		host->data_early = 0;
		host->data->bytes_xfered = 0;

		if (host->flags & (SDHCI_USE_SDMA \| SDHCI_USE_ADMA))
		if (host->flags & (SDHCI_USE_SDMA \| SDHCI_USE_ADMA)) {
		struct scatterlist *sg;
		unsigned int length_mask, offset_mask;
		int i;

		host->flags \|= SDHCI_REQ_USE_DMA;

		/*
		@@ -735,11 +739,6 @@ static void sdhci_prepare_data(struct sdhci_host host, struct mmc_command cmd)
		* The assumption here being that alignment and lengths are
		* the same after DMA mapping to device address space.
		*/
		if (host->flags & SDHCI_REQ_USE_DMA) {
		struct scatterlist *sg;
		unsigned int length_mask, offset_mask;
		int i;

		length_mask = 0;
		offset_mask = 0;
		if (host->flags & SDHCI_USE_ADMA) {

Admin message