diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-17 23:36:59 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-17 23:36:59 +0300 |
| commit | 04b7fe6a4a231871ef681bc95e08fe66992f7b1f (patch) | |
| tree | d9eba9e6a57ad9323268b6bc9a7e5516d18e9583 | |
| parent | 388f997620cb57372c494a194e9698b28cc179b8 (diff) | |
| parent | d681f1166919d6829083c069a83edcd59bfd5e34 (diff) | |
| download | linux-04b7fe6a4a231871ef681bc95e08fe66992f7b1f.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
Pull IDE update from David Miller:
"Just one change, getting rid of usage of the deprecated PCI DMA
interfaces in the IDE drivers"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
ide: remove deprecated use of pci api
| -rw-r--r-- | drivers/ide/cs5520.c | 2 | ||||
| -rw-r--r-- | drivers/ide/pmac.c | 5 | ||||
| -rw-r--r-- | drivers/ide/setup-pci.c | 2 | ||||
| -rw-r--r-- | drivers/ide/sgiioc4.c | 4 |
4 files changed, 6 insertions, 7 deletions
diff --git a/drivers/ide/cs5520.c b/drivers/ide/cs5520.c index 6250aee30503..89a4ff100b7a 100644 --- a/drivers/ide/cs5520.c +++ b/drivers/ide/cs5520.c @@ -123,7 +123,7 @@ static int cs5520_init_one(struct pci_dev *dev, const struct pci_device_id *id) return -ENODEV; } 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", d->name); return -ENODEV; diff --git a/drivers/ide/pmac.c b/drivers/ide/pmac.c index d24a3f8b49bc..96a345248224 100644 --- a/drivers/ide/pmac.c +++ b/drivers/ide/pmac.c @@ -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 * aligning the start address to a multiple of 16 bytes. */ - pmif->dma_table_cpu = pci_alloc_consistent( - dev, + pmif->dma_table_cpu = dma_alloc_coherent(&dev->dev, (MAX_DCMDS + 2) * sizeof(struct dbdma_cmd), - &hwif->dmatable_dma); + &hwif->dmatable_dma, GFP_KERNEL); if (pmif->dma_table_cpu == NULL) { printk(KERN_ERR "%s: unable to allocate DMA command list\n", hwif->name); diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c index 34a5e5223d50..112d2fe1bcdb 100644 --- a/drivers/ide/setup-pci.c +++ b/drivers/ide/setup-pci.c @@ -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 * (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) { printk(KERN_ERR "%s %s: can't set DMA mask\n", d->name, pci_name(dev)); diff --git a/drivers/ide/sgiioc4.c b/drivers/ide/sgiioc4.c index 63761db61384..2d35e9f7516f 100644 --- a/drivers/ide/sgiioc4.c +++ b/drivers/ide/sgiioc4.c @@ -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)) goto dma_pci_alloc_failure; - pad = pci_alloc_consistent(dev, IOC4_IDE_CACHELINE_SIZE, - (dma_addr_t *)&hwif->extra_base); + pad = dma_alloc_coherent(&dev->dev, IOC4_IDE_CACHELINE_SIZE, + (dma_addr_t *)&hwif->extra_base, GFP_KERNEL); if (pad) { ide_set_hwifdata(hwif, pad); return 0; |