Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd9ff18b authored by Alexandre Courbot's avatar Alexandre Courbot Committed by Ulf Hansson
Browse files

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: default avatarAlexandre Courbot <acourbot@nvidia.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 741b48f4

drivers/mmc/host/sdhci-pci-core.c

+0 −15
Original line number Diff line number Diff line
@@ -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;