p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ide: 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>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Quentin Lambert 2015-04-13 10:26:53 +02:00 committed by David S. Miller
parent 54e514b91b
commit d681f11669
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/ide/cs5520.c
View File

@ -123,7 +123,7 @@ static int cs5520_init_one(struct pci_dev *dev, const struct pci_device_id *id)
return -ENODEV; return -ENODEV;
} }
pci_set_master(dev); pci_set_master(dev);
if (pci_set_dma_mask(dev, DMA_BIT_MASK(32))) { if (dma_set_mask(&dev->dev, DMA_BIT_MASK(32))) {
printk(KERN_WARNING "%s: No suitable DMA available.\n", printk(KERN_WARNING "%s: No suitable DMA available.\n",
d->name); d->name);
return -ENODEV; return -ENODEV;

5
drivers/ide/pmac.c
View File

@ -1689,10 +1689,9 @@ static int pmac_ide_init_dma(ide_hwif_t *hwif, const struct ide_port_info *d)
* The +2 is +1 for the stop command and +1 to allow for * The +2 is +1 for the stop command and +1 to allow for
* aligning the start address to a multiple of 16 bytes. * aligning the start address to a multiple of 16 bytes.
*/ */
pmif->dma_table_cpu = pci_alloc_consistent( pmif->dma_table_cpu = dma_alloc_coherent(&dev->dev,
dev,
(MAX_DCMDS + 2) * sizeof(struct dbdma_cmd), (MAX_DCMDS + 2) * sizeof(struct dbdma_cmd),
&hwif->dmatable_dma); &hwif->dmatable_dma, GFP_KERNEL);
if (pmif->dma_table_cpu == NULL) { if (pmif->dma_table_cpu == NULL) {
printk(KERN_ERR "%s: unable to allocate DMA command list\n", printk(KERN_ERR "%s: unable to allocate DMA command list\n",
hwif->name); hwif->name);

2
drivers/ide/setup-pci.c
View File

@ -209,7 +209,7 @@ static int ide_pci_enable(struct pci_dev *dev, const struct ide_port_info *d)
* a DMA mask field to the struct ide_port_info if we need it * a DMA mask field to the struct ide_port_info if we need it
* (or let lower level driver set the DMA mask) * (or let lower level driver set the DMA mask)
*/ */
ret = pci_set_dma_mask(dev, DMA_BIT_MASK(32)); ret = dma_set_mask(&dev->dev, DMA_BIT_MASK(32));
if (ret < 0) { if (ret < 0) {
printk(KERN_ERR "%s %s: can't set DMA mask\n", printk(KERN_ERR "%s %s: can't set DMA mask\n",
d->name, pci_name(dev)); d->name, pci_name(dev));

4
drivers/ide/sgiioc4.c
View File

@ -334,8 +334,8 @@ static int ide_dma_sgiioc4(ide_hwif_t *hwif, const struct ide_port_info *d)
if (ide_allocate_dma_engine(hwif)) if (ide_allocate_dma_engine(hwif))
goto dma_pci_alloc_failure; goto dma_pci_alloc_failure;
pad = pci_alloc_consistent(dev, IOC4_IDE_CACHELINE_SIZE, pad = dma_alloc_coherent(&dev->dev, IOC4_IDE_CACHELINE_SIZE,
(dma_addr_t *)&hwif->extra_base); (dma_addr_t *)&hwif->extra_base, GFP_KERNEL);
if (pad) { if (pad) {
ide_set_hwifdata(hwif, pad); ide_set_hwifdata(hwif, pad);
return 0; return 0;