PCI: Remove pci_set_dma_max_seg_size()

The few callers can just use dma_set_max_seg_size ()directly.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/ata/sata_inic162x.c b/drivers/ata/sata_inic162x.c
index 9b6d793..e0bcf9b 100644 (file)
--- a/drivers/ata/sata_inic162x.c
+++ b/drivers/ata/sata_inic162x.c
@@ -873,7 +873,7 @@ static int inic_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         * like others but it will lock up the whole machine HARD if
         * 65536 byte PRD entry is fed. Reduce maximum segment size.
         */
-       rc = pci_set_dma_max_seg_size(pdev, 65536 - 512);
+       rc = dma_set_max_seg_size(&pdev->dev, 65536 - 512);
        if (rc) {
                dev_err(&pdev->dev, "failed to set the maximum segment size\n");
                return rc;

diff --git a/drivers/block/rsxx/core.c b/drivers/block/rsxx/core.c
index f2c631c..37df486 100644 (file)
--- a/drivers/block/rsxx/core.c
+++ b/drivers/block/rsxx/core.c
@@ -780,7 +780,7 @@ static int rsxx_pci_probe(struct pci_dev *dev,
                goto failed_enable;
 
        pci_set_master(dev);
-       pci_set_dma_max_seg_size(dev, RSXX_HW_BLK_SIZE);
+       dma_set_max_seg_size(&dev->dev, RSXX_HW_BLK_SIZE);
 
        st = pci_set_dma_mask(dev, DMA_BIT_MASK(64));
        if (st) {

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 72dd926..75d8965 100644 (file)
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -2397,7 +2397,7 @@ void pci_device_add(struct pci_dev *dev, struct pci_bus *bus)
        dev->dev.dma_parms = &dev->dma_parms;
        dev->dev.coherent_dma_mask = 0xffffffffull;
 
-       pci_set_dma_max_seg_size(dev, 65536);
+       dma_set_max_seg_size(&dev->dev, 65536);
        dma_set_seg_boundary(&dev->dev, 0xffffffff);
 
        /* Fix up broken headers */

diff --git a/drivers/s390/net/ism_drv.c b/drivers/s390/net/ism_drv.c
index 8688c0f..f96ec68 100644 (file)
--- a/drivers/s390/net/ism_drv.c
+++ b/drivers/s390/net/ism_drv.c
@@ -516,7 +516,7 @@ static int ism_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                goto err_unmap;
 
        dma_set_seg_boundary(&pdev->dev, SZ_1M - 1);
-       pci_set_dma_max_seg_size(pdev, SZ_1M);
+       dma_set_max_seg_size(&pdev->dev, SZ_1M);
        pci_set_master(pdev);
 
        ism->smcd = smcd_alloc_dev(&pdev->dev, dev_name(&pdev->dev), &ism_ops,

diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
index 0444357..53eb2e9 100644 (file)
--- a/drivers/scsi/aacraid/linit.c
+++ b/drivers/scsi/aacraid/linit.c
@@ -1747,7 +1747,7 @@ static int aac_probe_one(struct pci_dev *pdev, const struct pci_device_id *id)
                shost->max_sectors = (shost->sg_tablesize * 8) + 112;
        }
 
-       error = pci_set_dma_max_seg_size(pdev,
+       error = dma_set_max_seg_size(&pdev->dev,
                (aac->adapter_info.options & AAC_OPT_NEW_COMM) ?
                        (shost->max_sectors << 9) : 65536);
        if (error)

diff --git a/include/linux/pci-dma-compat.h b/include/linux/pci-dma-compat.h
index 558a109..cb1adf0 100644 (file)
--- a/include/linux/pci-dma-compat.h
+++ b/include/linux/pci-dma-compat.h
@@ -119,20 +119,11 @@ static inline int pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask)
 {
        return dma_set_coherent_mask(&dev->dev, mask);
 }
-
-static inline int pci_set_dma_max_seg_size(struct pci_dev *dev,
-                                          unsigned int size)
-{
-       return dma_set_max_seg_size(&dev->dev, size);
-}
 #else
 static inline int pci_set_dma_mask(struct pci_dev *dev, u64 mask)
 { return -EIO; }
 static inline int pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask)
 { return -EIO; }
-static inline int pci_set_dma_max_seg_size(struct pci_dev *dev,
-                                          unsigned int size)
-{ return -EIO; }
 #endif
 
 #endif