Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1350141

[PATCH v3 3/3] mmc: sdhci-pci: Do not set DMA mask in enable_dma()

Show all headers | View raw

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>
---
 drivers/mmc/host/sdhci-pci-core.c | 15 ---------------
 1 file changed, 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;
-- 
2.7.2

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v3 0/3] mmc: sdhci: Set DMA mask properly Alexandre Courbot <acourbot@nvidia.com> - 2016-03-04 11:40 +0100
  [PATCH v3 1/3] mmc: sdhci: Set DMA mask when adding host Alexandre Courbot <acourbot@nvidia.com> - 2016-03-04 11:50 +0100
    Re: [PATCH v3 1/3] mmc: sdhci: Set DMA mask when adding host Arnd Bergmann <arnd@arndb.de> - 2016-03-04 17:00 +0100
      Re: [PATCH v3 1/3] mmc: sdhci: Set DMA mask when adding host Alexandre Courbot <gnurou@gmail.com> - 2016-03-07 03:10 +0100
  [PATCH v3 2/3] mmc: sdhci-acpi: Remove enable_dma() hook Alexandre Courbot <acourbot@nvidia.com> - 2016-03-04 11:50 +0100
    Re: [PATCH v3 2/3] mmc: sdhci-acpi: Remove enable_dma() hook Arnd Bergmann <arnd@arndb.de> - 2016-03-04 17:00 +0100
  [PATCH v3 3/3] mmc: sdhci-pci: Do not set DMA mask in enable_dma() Alexandre Courbot <acourbot@nvidia.com> - 2016-03-04 11:50 +0100
    Re: [PATCH v3 3/3] mmc: sdhci-pci: Do not set DMA mask in enable_dma() Arnd Bergmann <arnd@arndb.de> - 2016-03-04 17:00 +0100
  Re: [PATCH v3 0/3] mmc: sdhci: Set DMA mask properly Arnd Bergmann <arnd@arndb.de> - 2016-03-04 17:00 +0100

csiph-web