memstick: remove deprecated use of pci api

Replace occurences of the pci api by appropriate call to the dma api.

A simplified version of the semantic patch that finds this problem is as
follows: (http://coccinelle.lip6.fr)

@deprecated@
idexpression id;
position p;
@@

(
  pci_dma_supported@p ( id, ...)
|
  pci_alloc_consistent@p ( id, ...)
)

@bad1@
idexpression id;
position deprecated.p;
@@
...when != &id->dev
   when != pci_get_drvdata ( id )
   when != pci_enable_device ( id )
(
  pci_dma_supported@p ( id, ...)
|
  pci_alloc_consistent@p ( id, ...)
)

@depends on !bad1@
idexpression id;
expression direction;
position deprecated.p;
@@

(
- pci_dma_supported@p ( id,
+ dma_supported ( &id->dev,
...
+ , GFP_ATOMIC
  )
|
- pci_alloc_consistent@p ( id,
+ dma_alloc_coherent ( &id->dev,
...
+ , GFP_ATOMIC
  )
)

Signed-off-by: Quentin Lambert <lambert.quentin@gmail.com>
Cc: Maxim Levitsky <maximlevitsky@gmail.com>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/memstick/host/jmb38x_ms.c b/drivers/memstick/host/jmb38x_ms.c
index aeabaa5aedf7d2cbf4a76fa15b2547349adc0dd5..48db922075e2adbcec880950edf7a9700827218b 100644 (file)
--- a/drivers/memstick/host/jmb38x_ms.c
+++ b/drivers/memstick/host/jmb38x_ms.c
@@ -419,10 +419,10 @@ static int jmb38x_ms_issue_cmd(struct memstick_host *msh)
        }
 
        if (host->cmd_flags & DMA_DATA) {
-               if (1 != pci_map_sg(host->chip->pdev, &host->req->sg, 1,
+               if (1 != dma_map_sg(&host->chip->pdev->dev, &host->req->sg, 1,
                                    host->req->data_dir == READ
-                                   ? PCI_DMA_FROMDEVICE
-                                   : PCI_DMA_TODEVICE)) {
+                                   ? DMA_FROM_DEVICE
+                                   : DMA_TO_DEVICE)) {
                        host->req->error = -ENOMEM;
                        return host->req->error;
                }
@@ -487,9 +487,9 @@ static void jmb38x_ms_complete_cmd(struct memstick_host *msh, int last)
        writel(0, host->addr + DMA_CONTROL);
 
        if (host->cmd_flags & DMA_DATA) {
-               pci_unmap_sg(host->chip->pdev, &host->req->sg, 1,
+               dma_unmap_sg(&host->chip->pdev->dev, &host->req->sg, 1,
                             host->req->data_dir == READ
-                            ? PCI_DMA_FROMDEVICE : PCI_DMA_TODEVICE);
+                            ? DMA_FROM_DEVICE : DMA_TO_DEVICE);
        } else {
                t_val = readl(host->addr + INT_STATUS_ENABLE);
                if (host->req->data_dir == READ)
@@ -925,7 +925,7 @@ static int jmb38x_ms_probe(struct pci_dev *pdev,
        int pci_dev_busy = 0;
        int rc, cnt;
 
-       rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
+       rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
        if (rc)
                return rc;
 

diff --git a/drivers/memstick/host/r592.c b/drivers/memstick/host/r592.c
index e2a4f5f415b2be30d0b223d7fac1e423dec411cf..ef09ba0289d723698b3ce7bfc06ff7cefd59cc96 100644 (file)
--- a/drivers/memstick/host/r592.c
+++ b/drivers/memstick/host/r592.c
@@ -754,7 +754,7 @@ static int r592_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                goto error2;
 
        pci_set_master(pdev);
-       error = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
+       error = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
        if (error)
                goto error3;
 
@@ -787,8 +787,8 @@ static int r592_probe(struct pci_dev *pdev, const struct pci_device_id *id)
        }
 
        /* This is just a precation, so don't fail */
-       dev->dummy_dma_page = pci_alloc_consistent(pdev, PAGE_SIZE,
-               &dev->dummy_dma_page_physical_address);
+       dev->dummy_dma_page = dma_alloc_coherent(&pdev->dev, PAGE_SIZE,
+               &dev->dummy_dma_page_physical_address, GFP_KERNEL);
        r592_stop_dma(dev , 0);
 
        if (request_irq(dev->irq, &r592_irq, IRQF_SHARED,
@@ -805,7 +805,7 @@ error7:
        free_irq(dev->irq, dev);
 error6:
        if (dev->dummy_dma_page)
-               pci_free_consistent(pdev, PAGE_SIZE, dev->dummy_dma_page,
+               dma_free_coherent(&pdev->dev, PAGE_SIZE, dev->dummy_dma_page,
                        dev->dummy_dma_page_physical_address);
 
        kthread_stop(dev->io_thread);
@@ -845,7 +845,7 @@ static void r592_remove(struct pci_dev *pdev)
        memstick_free_host(dev->host);
 
        if (dev->dummy_dma_page)
-               pci_free_consistent(pdev, PAGE_SIZE, dev->dummy_dma_page,
+               dma_free_coherent(&pdev->dev, PAGE_SIZE, dev->dummy_dma_page,
                        dev->dummy_dma_page_physical_address);
 }