mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-23 12:43:55 +08:00
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> Acked-by: Adrian Hunter <adrian.hunter@intel.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
parent
741b48f4f3
commit
bd9ff18bff
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user