Browse Source

PCI: Remove pci_set_dma_seg_boundary()

The two callers can just use dma_set_seg_boundary() directly.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Christoph Hellwig 6 years ago
parent
commit
a6f44cf9f5
3 changed files with 2 additions and 11 deletions
  1. 1 1
      drivers/pci/probe.c
  2. 1 1
      drivers/s390/net/ism_drv.c
  3. 0 9
      include/linux/pci-dma-compat.h

+ 1 - 1
drivers/pci/probe.c

@@ -2398,7 +2398,7 @@ void pci_device_add(struct pci_dev *dev, struct pci_bus *bus)
 	dev->dev.coherent_dma_mask = 0xffffffffull;
 	dev->dev.coherent_dma_mask = 0xffffffffull;
 
 
 	pci_set_dma_max_seg_size(dev, 65536);
 	pci_set_dma_max_seg_size(dev, 65536);
-	pci_set_dma_seg_boundary(dev, 0xffffffff);
+	dma_set_seg_boundary(&dev->dev, 0xffffffff);
 
 
 	/* Fix up broken headers */
 	/* Fix up broken headers */
 	pci_fixup_device(pci_fixup_header, dev);
 	pci_fixup_device(pci_fixup_header, dev);

+ 1 - 1
drivers/s390/net/ism_drv.c

@@ -515,7 +515,7 @@ static int ism_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 	if (ret)
 	if (ret)
 		goto err_unmap;
 		goto err_unmap;
 
 
-	pci_set_dma_seg_boundary(pdev, SZ_1M - 1);
+	dma_set_seg_boundary(&pdev->dev, SZ_1M - 1);
 	pci_set_dma_max_seg_size(pdev, SZ_1M);
 	pci_set_dma_max_seg_size(pdev, SZ_1M);
 	pci_set_master(pdev);
 	pci_set_master(pdev);
 
 

+ 0 - 9
include/linux/pci-dma-compat.h

@@ -125,12 +125,6 @@ static inline int pci_set_dma_max_seg_size(struct pci_dev *dev,
 {
 {
 	return dma_set_max_seg_size(&dev->dev, size);
 	return dma_set_max_seg_size(&dev->dev, size);
 }
 }
-
-static inline int pci_set_dma_seg_boundary(struct pci_dev *dev,
-					   unsigned long mask)
-{
-	return dma_set_seg_boundary(&dev->dev, mask);
-}
 #else
 #else
 static inline int pci_set_dma_mask(struct pci_dev *dev, u64 mask)
 static inline int pci_set_dma_mask(struct pci_dev *dev, u64 mask)
 { return -EIO; }
 { return -EIO; }
@@ -139,9 +133,6 @@ static inline int pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask)
 static inline int pci_set_dma_max_seg_size(struct pci_dev *dev,
 static inline int pci_set_dma_max_seg_size(struct pci_dev *dev,
 					   unsigned int size)
 					   unsigned int size)
 { return -EIO; }
 { return -EIO; }
-static inline int pci_set_dma_seg_boundary(struct pci_dev *dev,
-					   unsigned long mask)
-{ return -EIO; }
 #endif
 #endif
 
 
 #endif
 #endif