diff options
author | Quentin Lambert <lambert.quentin@gmail.com> | 2015-04-08 08:34:10 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2015-04-08 10:55:05 -0400 |
commit | c54c719b558e0eb3ba60b1390aeb47ed25ff4352 (patch) | |
tree | 9f3910a5f77015a4c81a01d9f29278843d64b39a /drivers/ata/acard-ahci.c | |
parent | 9a1e75e11a8d09c5cba022e1ac04b0785354f708 (diff) |
ata: 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: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/ata/acard-ahci.c')
-rw-r--r-- | drivers/ata/acard-ahci.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ata/acard-ahci.c b/drivers/ata/acard-ahci.c index c962886d7e71..12489ce863c4 100644 --- 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) | |||
181 | int rc; | 181 | int rc; |
182 | 182 | ||
183 | if (using_dac && | 183 | if (using_dac && |
184 | !pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) { | 184 | !dma_set_mask(&pdev->dev, DMA_BIT_MASK(64))) { |
185 | rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64)); | 185 | rc = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64)); |
186 | if (rc) { | 186 | if (rc) { |
187 | rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)); | 187 | rc = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); |
188 | if (rc) { | 188 | if (rc) { |
189 | dev_err(&pdev->dev, | 189 | dev_err(&pdev->dev, |
190 | "64-bit DMA enable failed\n"); | 190 | "64-bit DMA enable failed\n"); |
@@ -192,12 +192,12 @@ static int acard_ahci_configure_dma_masks(struct pci_dev *pdev, int using_dac) | |||
192 | } | 192 | } |
193 | } | 193 | } |
194 | } else { | 194 | } else { |
195 | rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); | 195 | rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)); |
196 | if (rc) { | 196 | if (rc) { |
197 | dev_err(&pdev->dev, "32-bit DMA enable failed\n"); | 197 | dev_err(&pdev->dev, "32-bit DMA enable failed\n"); |
198 | return rc; | 198 | return rc; |
199 | } | 199 | } |
200 | rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)); | 200 | rc = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); |
201 | if (rc) { | 201 | if (rc) { |
202 | dev_err(&pdev->dev, | 202 | dev_err(&pdev->dev, |
203 | "32-bit consistent DMA enable failed\n"); | 203 | "32-bit consistent DMA enable failed\n"); |