projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ata: remove deprecated use of pci api
[deliverable/linux.git]
/
drivers
/
ata
/
acard-ahci.c
diff --git
a/drivers/ata/acard-ahci.c
b/drivers/ata/acard-ahci.c
index c962886d7e7149fdde2c7ecda9ecf68ab04379ce..12489ce863c4bf06c06a38aa182124785346e365 100644
(file)
--- a/
drivers/ata/acard-ahci.c
+++ b/
drivers/ata/acard-ahci.c
@@
-181,10
+181,10
@@
static int acard_ahci_configure_dma_masks(struct pci_dev *pdev, int using_dac)
int rc;
if (using_dac &&
int rc;
if (using_dac &&
- !
pci_set_dma_mask(p
dev, DMA_BIT_MASK(64))) {
- rc =
pci_set_consistent_dma_mask(p
dev, DMA_BIT_MASK(64));
+ !
dma_set_mask(&pdev->
dev, DMA_BIT_MASK(64))) {
+ rc =
dma_set_coherent_mask(&pdev->
dev, DMA_BIT_MASK(64));
if (rc) {
if (rc) {
- rc =
pci_set_consistent_dma_mask(p
dev, DMA_BIT_MASK(32));
+ rc =
dma_set_coherent_mask(&pdev->
dev, DMA_BIT_MASK(32));
if (rc) {
dev_err(&pdev->dev,
"64-bit DMA enable failed\n");
if (rc) {
dev_err(&pdev->dev,
"64-bit DMA enable failed\n");
@@
-192,12
+192,12
@@
static int acard_ahci_configure_dma_masks(struct pci_dev *pdev, int using_dac)
}
}
} else {
}
}
} else {
- rc =
pci_set_dma_mask(p
dev, DMA_BIT_MASK(32));
+ rc =
dma_set_mask(&pdev->
dev, DMA_BIT_MASK(32));
if (rc) {
dev_err(&pdev->dev, "32-bit DMA enable failed\n");
return rc;
}
if (rc) {
dev_err(&pdev->dev, "32-bit DMA enable failed\n");
return rc;
}
- rc =
pci_set_consistent_dma_mask(p
dev, DMA_BIT_MASK(32));
+ rc =
dma_set_coherent_mask(&pdev->
dev, DMA_BIT_MASK(32));
if (rc) {
dev_err(&pdev->dev,
"32-bit consistent DMA enable failed\n");
if (rc) {
dev_err(&pdev->dev,
"32-bit consistent DMA enable failed\n");
This page took
0.026805 seconds
and
5
git commands to generate.