[PATCH] PCI: remove all usages of pci_dma_sync_single as it's obsolete.

Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>

diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
index 3959cf83e5ae9bae092f30d7fd43791208987685..f16f46879aff4794380bfad639c978819b3b7d35 100644 (file)
--- a/drivers/atm/idt77252.c
+++ b/drivers/atm/idt77252.c
@@ -1266,8 +1266,9 @@ idt77252_rx_raw(struct idt77252_dev *card)
        head = IDT77252_PRV_PADDR(queue) + (queue->data - queue->head - 16);
        tail = readl(SAR_REG_RAWCT);
 
-       pci_dma_sync_single(card->pcidev, IDT77252_PRV_PADDR(queue),
-                           queue->end - queue->head - 16, PCI_DMA_FROMDEVICE);
+       pci_dma_sync_single_for_cpu(card->pcidev, IDT77252_PRV_PADDR(queue),
+                                   queue->end - queue->head - 16,
+                                   PCI_DMA_FROMDEVICE);
 
        while (head != tail) {
                unsigned int vpi, vci, pti;
@@ -1360,10 +1361,10 @@ drop:
                        if (next) {
                                card->raw_cell_head = next;
                                queue = card->raw_cell_head;
-                               pci_dma_sync_single(card->pcidev,
-                                                   IDT77252_PRV_PADDR(queue),
-                                                   queue->end - queue->data,
-                                                   PCI_DMA_FROMDEVICE);
+                               pci_dma_sync_single_for_cpu(card->pcidev,
+                                                           IDT77252_PRV_PADDR(queue),
+                                                           queue->end - queue->data,
+                                                           PCI_DMA_FROMDEVICE);
                        } else {
                                card->raw_cell_head = NULL;
                                printk("%s: raw cell queue overrun\n",

diff --git a/drivers/net/wireless/prism54/islpci_mgt.c b/drivers/net/wireless/prism54/islpci_mgt.c
index 95b709c907c5e6117cada2e6452df09f6ee1a216..93a7b3172a9b2c0271da173fc09614a39c6d8f3b 100644 (file)
--- a/drivers/net/wireless/prism54/islpci_mgt.c
+++ b/drivers/net/wireless/prism54/islpci_mgt.c
@@ -319,8 +319,8 @@ islpci_mgt_receive(struct net_device *ndev)
                }
 
                /* Ensure the results of device DMA are visible to the CPU. */
-               pci_dma_sync_single(priv->pdev, buf->pci_addr,
-                                   buf->size, PCI_DMA_FROMDEVICE);
+               pci_dma_sync_single_for_cpu(priv->pdev, buf->pci_addr,
+                                           buf->size, PCI_DMA_FROMDEVICE);
 
                /* Perform endianess conversion for PIMFOR header in-place. */
                header = pimfor_decode_header(buf->mem, frag_len);

diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c
index 32f7d3ded5a8087ed5b149fd7f6f2dfb139111a7..e633d3cd656d88f4f9707960147eb1addd58b6f9 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_mbox.c
+++ b/drivers/scsi/megaraid/megaraid_mbox.c
@@ -1554,7 +1554,7 @@ mbox_post_cmd(adapter_t *adapter, scb_t *scb)
 
        if (scb->dma_direction == PCI_DMA_TODEVICE) {
                if (!scb->scp->use_sg) {        // sg list not used
-                       pci_dma_sync_single(adapter->pdev, ccb->buf_dma_h,
+                       pci_dma_sync_single_for_cpu(adapter->pdev, ccb->buf_dma_h,
                                        scb->scp->request_bufflen,
                                        PCI_DMA_TODEVICE);
                }
@@ -2332,7 +2332,7 @@ megaraid_mbox_sync_scb(adapter_t *adapter, scb_t *scb)
 
        case MRAID_DMA_WBUF:
                if (scb->dma_direction == PCI_DMA_FROMDEVICE) {
-                       pci_dma_sync_single(adapter->pdev,
+                       pci_dma_sync_single_for_cpu(adapter->pdev,
                                        ccb->buf_dma_h,
                                        scb->scp->request_bufflen,
                                        PCI_DMA_FROMDEVICE);

diff --git a/include/linux/pci.h b/include/linux/pci.h
index 1ff807d655c175b366791606ad2650cc6c5d5e86..f021797cd805b181718ffd91ffea79253d8c16e7 100644 (file)
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1,5 +1,5 @@
 /*
- *     $Id: pci.h,v 1.87 1998/10/11 15:13:12 mj Exp $
+ *     pci.h
  *
  *     PCI defines and function prototypes
  *     Copyright 1994, Drew Eckhardt
@@ -858,9 +858,6 @@ extern void msi_remove_pci_irq_vectors(struct pci_dev *dev);
 
 #include <asm/pci.h>
 
-/* Backwards compat, remove in 2.7.x */
-#define pci_dma_sync_single    pci_dma_sync_single_for_cpu
-
 /*
  *  If the system does not have PCI, clearly these return errors.  Define
  *  these as simple inline functions to avoid hair in drivers.