Merge tag 'iommu-updates-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / drivers / pci / probe.c

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 01eb8038fceb2b5455c21d9d33849592d4db670d..19c8950c6c382f3c56c9337565483fd2a74419b4 100644 (file)
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1914,33 +1914,6 @@ static void pci_set_msi_domain(struct pci_dev *dev)
        dev_set_msi_domain(&dev->dev, d);
 }
 
-/**
- * pci_dma_configure - Setup DMA configuration
- * @dev: ptr to pci_dev struct of the PCI device
- *
- * Function to update PCI devices's DMA configuration using the same
- * info from the OF node or ACPI node of host bridge's parent (if any).
- */
-static void pci_dma_configure(struct pci_dev *dev)
-{
-       struct device *bridge = pci_get_host_bridge_device(dev);
-
-       if (IS_ENABLED(CONFIG_OF) &&
-               bridge->parent && bridge->parent->of_node) {
-                       of_dma_configure(&dev->dev, bridge->parent->of_node);
-       } else if (has_acpi_companion(bridge)) {
-               struct acpi_device *adev = to_acpi_device_node(bridge->fwnode);
-               enum dev_dma_attr attr = acpi_get_dma_attr(adev);
-
-               if (attr == DEV_DMA_NOT_SUPPORTED)
-                       dev_warn(&dev->dev, "DMA not supported.\n");
-               else
-                       acpi_dma_configure(&dev->dev, attr);
-       }
-
-       pci_put_host_bridge_device(bridge);
-}
-
 void pci_device_add(struct pci_dev *dev, struct pci_bus *bus)
 {
        int ret;
@@ -1954,7 +1927,6 @@ void pci_device_add(struct pci_dev *dev, struct pci_bus *bus)
        dev->dev.dma_mask = &dev->dma_mask;
        dev->dev.dma_parms = &dev->dma_parms;
        dev->dev.coherent_dma_mask = 0xffffffffull;
-       pci_dma_configure(dev);
 
        pci_set_dma_max_seg_size(dev, 65536);
        pci_set_dma_seg_boundary(dev, 0xffffffff);