diff options
| author | Alexandre Courbot <acourbot@nvidia.com> | 2016-03-04 19:17:11 +0900 |
|---|---|---|
| committer | Alexandre Courbot <acourbot@nvidia.com> | 2016-03-15 11:19:56 +0900 |
| commit | e5daa27e57101cddd46a73bc5fda23963a995661 (patch) | |
| tree | c97c652da5014c760ad403ac372c5784f2f8c661 | |
| parent | bdc9be236c4b88b1edcd6716a7c87a3dcc9640a4 (diff) | |
| download | linux-next-e5daa27e57101cddd46a73bc5fda23963a995661.tar.gz | |
mmc: sdhci-pci: Do not set DMA mask in enable_dma()
DMA mask will already be set by sdhci_set_dma_mask(), which
is equivalent to the removed code since pci_set_dma_mask()
expands to its DMA-API counterpart.
There should also be no reason to set the DMA mask after probe.
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | drivers/mmc/host/sdhci-pci-core.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c index df3b8eced8c4..62aa5d0efcee 100644 --- a/drivers/mmc/host/sdhci-pci-core.c +++ b/drivers/mmc/host/sdhci-pci-core.c @@ -1302,7 +1302,6 @@ static int sdhci_pci_enable_dma(struct sdhci_host *host) { struct sdhci_pci_slot *slot; struct pci_dev *pdev; - int ret = -1; slot = sdhci_priv(host); pdev = slot->chip->pdev; @@ -1314,20 +1313,6 @@ static int sdhci_pci_enable_dma(struct sdhci_host *host) "doesn't fully claim to support it.\n"); } - 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 { - ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(64)); - if (ret) - dev_warn(&pdev->dev, "Failed to set 64-bit DMA mask\n"); - } - } - if (ret) - ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); - if (ret) - return ret; - pci_set_master(pdev); return 0; |