mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-23 04:34:11 +08:00
mmc: sdhci: further code simplication
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>
This commit is contained in:
parent
df953925a5
commit
fce1442164
@ -725,21 +725,20 @@ 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))
|
||||
host->flags |= SDHCI_REQ_USE_DMA;
|
||||
|
||||
/*
|
||||
* FIXME: This doesn't account for merging when mapping the
|
||||
* scatterlist.
|
||||
*
|
||||
* 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) {
|
||||
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;
|
||||
|
||||
/*
|
||||
* FIXME: This doesn't account for merging when mapping the
|
||||
* scatterlist.
|
||||
*
|
||||
* The assumption here being that alignment and lengths are
|
||||
* the same after DMA mapping to device address space.
|
||||
*/
|
||||
length_mask = 0;
|
||||
offset_mask = 0;
|
||||
if (host->flags & SDHCI_USE_ADMA) {
|
||||
|
Loading…
Reference in New Issue
Block a user