aboutsummaryrefslogtreecommitdiff
path: root/drivers/pci
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2010-03-10 15:23:38 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-12 15:52:42 -0800
commite3c4bccabaf3e5c13f4b307c7737cbe8d0cecd02 (patch)
treee486608f8a24af1a7839ea28915a3b36dc568305 /drivers/pci
parentc186caca3dbe7f44da624cb4f9d78e1b1dfb13b8 (diff)
dma-mapping: pci: convert pci_set_dma_mask to call dma_set_mask
This changes pci_set_dma_mask to call the generic DMA API, dma_set_mask. pci_set_dma_mask (in drivers/pci/pci.c) does the same things that dma_set_mask does on all the architectures that use pci_set_dma_mask; calls dma_supprted and sets dev->dma_mask. So we safely change pci_set_dma_mask to simply call dma_set_mask. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Cc: James Bottomley <James.Bottomley@suse.de> Cc: David S. Miller <davem@davemloft.net> Cc: Jesse Barnes <jbarnes@virtuousgeek.org> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Russell King <linux@arm.linux.org.uk> Cc: Greg KH <greg@kroah.com> Cc: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/pci.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index fdcf01af676..b2d23d1b0d4 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -2305,15 +2305,13 @@ void pci_msi_off(struct pci_dev *dev)
int
pci_set_dma_mask(struct pci_dev *dev, u64 mask)
{
- if (!pci_dma_supported(dev, mask))
- return -EIO;
-
- dev->dma_mask = mask;
+ int ret = dma_set_mask(&dev->dev, mask);
+ if (ret)
+ return ret;
dev_dbg(&dev->dev, "using %dbit DMA mask\n", fls64(mask));
-
return 0;
}
-
+
int
pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask)
{