diff options
| author | Subhash Jadavani <subhashj@codeaurora.org> | 2016-05-11 17:01:06 -0700 |
|---|---|---|
| committer | Subhash Jadavani <subhashj@codeaurora.org> | 2016-05-31 15:28:19 -0700 |
| commit | 95dee386c530bd90b84144bd2fca1adf56fa2634 (patch) | |
| tree | 264bc69b818064e588f72399726de0326e90975b /drivers/mmc | |
| parent | 330d3d586e0297385607aaddc192953c5e09321b (diff) | |
mmc: sdhci: clean up legacy adma related variables
msm-3.18 kernel had our own implementation of 64-bit ADMA support but
upstream kernel have now added its own implementation of 64-bit ADMA
support hence this patch removes some of the remaining variables from
our implementation.
Change-Id: I3ea8e9e498b25b75fb1f5ccc4ffe5f6986cd564a
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 4 | ||||
| -rw-r--r-- | drivers/mmc/host/sdhci.h | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index bb4165ae16a1..9beb37b4e241 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -1520,9 +1520,9 @@ static void sdhci_notify_halt(struct mmc_host *mmc, bool halt) mmc_hostname(mmc), halt); if (host->flags & SDHCI_USE_64_BIT_DMA) { if (halt) - host->adma_desc_line_sz = 16; + host->desc_sz = 16; else - host->adma_desc_line_sz = 12; + host->desc_sz = SDHCI_ADMA2_64_DESC_SZ; } } diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index fab63762623b..9b39821b57ef 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -564,11 +564,6 @@ struct sdhci_host { size_t adma_table_sz; /* ADMA descriptor table size */ size_t align_buffer_sz; /* Bounce buffer size */ - unsigned int adma_desc_sz; /* ADMA descriptor table size */ - unsigned int adma_desc_line_sz; /* ADMA descriptor line size */ - unsigned int align_buf_sz; /* Bounce buffer size */ - unsigned int adma_max_desc; /* Max ADMA descriptos (max sg segments) */ - dma_addr_t adma_addr; /* Mapped ADMA descr. table */ dma_addr_t align_addr; /* Mapped bounce buffer */ |