On 07/03/16 04:07, Alexandre Courbot wrote: > 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. Let's run that by the PCI mailing list just to be sure. The patches for reference: http://marc.info/?l=linux-mmc&m=145731654328126&w=2 http://marc.info/?l=linux-mmc&m=145731654328128&w=2 change the sdhci-pci driver to set the DMA mask once during probe instead of every time during resume. Is there any reason a PCI device driver might need to set the DMA mask every time during resume? > > Signed-off-by: Alexandre Courbot <acourbot@xxxxxxxxxx> > Acked-by: Arnd Bergmann <arnd@xxxxxxxx> > --- > 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; > -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
