mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 17:59:32 +00:00
mmc: sdhci-acpi: Remove enable_dma() hook
This hook was solely used to set the DMA mask, which is now done by the newly-added sdhci_set_dma_mask() function. The use of a flag to ensure the mask is only set once is a strong hint that it should not have been done there anyway. Signed-off-by: Alexandre Courbot <acourbot@nvidia.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Adrian Hunter <adrian.hunter@intel.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
parent
7b91369b46
commit
741b48f4f3
1 changed files with 0 additions and 30 deletions
|
@ -75,7 +75,6 @@ struct sdhci_acpi_host {
|
|||
const struct sdhci_acpi_slot *slot;
|
||||
struct platform_device *pdev;
|
||||
bool use_runtime_pm;
|
||||
bool dma_setup;
|
||||
};
|
||||
|
||||
static inline bool sdhci_acpi_flag(struct sdhci_acpi_host *c, unsigned int flag)
|
||||
|
@ -83,33 +82,6 @@ static inline bool sdhci_acpi_flag(struct sdhci_acpi_host *c, unsigned int flag)
|
|||
return c->slot && (c->slot->flags & flag);
|
||||
}
|
||||
|
||||
static int sdhci_acpi_enable_dma(struct sdhci_host *host)
|
||||
{
|
||||
struct sdhci_acpi_host *c = sdhci_priv(host);
|
||||
struct device *dev = &c->pdev->dev;
|
||||
int err = -1;
|
||||
|
||||
if (c->dma_setup)
|
||||
return 0;
|
||||
|
||||
if (host->flags & SDHCI_USE_64_BIT_DMA) {
|
||||
if (host->quirks2 & SDHCI_QUIRK2_BROKEN_64_BIT_DMA) {
|
||||
host->flags &= ~SDHCI_USE_64_BIT_DMA;
|
||||
} else {
|
||||
err = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64));
|
||||
if (err)
|
||||
dev_warn(dev, "Failed to set 64-bit DMA mask\n");
|
||||
}
|
||||
}
|
||||
|
||||
if (err)
|
||||
err = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));
|
||||
|
||||
c->dma_setup = !err;
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
static void sdhci_acpi_int_hw_reset(struct sdhci_host *host)
|
||||
{
|
||||
u8 reg;
|
||||
|
@ -127,7 +99,6 @@ static void sdhci_acpi_int_hw_reset(struct sdhci_host *host)
|
|||
|
||||
static const struct sdhci_ops sdhci_acpi_ops_dflt = {
|
||||
.set_clock = sdhci_set_clock,
|
||||
.enable_dma = sdhci_acpi_enable_dma,
|
||||
.set_bus_width = sdhci_set_bus_width,
|
||||
.reset = sdhci_reset,
|
||||
.set_uhs_signaling = sdhci_set_uhs_signaling,
|
||||
|
@ -135,7 +106,6 @@ static const struct sdhci_ops sdhci_acpi_ops_dflt = {
|
|||
|
||||
static const struct sdhci_ops sdhci_acpi_ops_int = {
|
||||
.set_clock = sdhci_set_clock,
|
||||
.enable_dma = sdhci_acpi_enable_dma,
|
||||
.set_bus_width = sdhci_set_bus_width,
|
||||
.reset = sdhci_reset,
|
||||
.set_uhs_signaling = sdhci_set_uhs_signaling,
|
||||
|
|
Loading…
Reference in a new issue