diff options
author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2010-03-10 18:23:40 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-12 18:52:42 -0500 |
commit | 6fee48cd330c68332f9712bc968d934a1a84a32a (patch) | |
tree | aaa9b904e612668a46ed4eac64f45c6fde71b45e /arch/arm/common | |
parent | 6e6c70e6910d21443ab0f894bab52b9ea653ef27 (diff) |
dma-mapping: arm: use generic pci_set_dma_mask and pci_set_consistent_dma_mask
This converts arm to the generic pci_set_dma_mask and
pci_set_consistent_dma_mask (removes HAVE_ARCH_PCI_SET_DMA_MASK for
dmabounce).
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Looked-over-by: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
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 'arch/arm/common')
-rw-r--r-- | arch/arm/common/it8152.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/arch/arm/common/it8152.c b/arch/arm/common/it8152.c index 2793447621c3..ee1d3b85eb65 100644 --- a/arch/arm/common/it8152.c +++ b/arch/arm/common/it8152.c | |||
@@ -272,33 +272,6 @@ int dma_needs_bounce(struct device *dev, dma_addr_t dma_addr, size_t size) | |||
272 | ((dma_addr + size - PHYS_OFFSET) >= SZ_64M); | 272 | ((dma_addr + size - PHYS_OFFSET) >= SZ_64M); |
273 | } | 273 | } |
274 | 274 | ||
275 | /* | ||
276 | * We override these so we properly do dmabounce otherwise drivers | ||
277 | * are able to set the dma_mask to 0xffffffff and we can no longer | ||
278 | * trap bounces. :( | ||
279 | * | ||
280 | * We just return true on everyhing except for < 64MB in which case | ||
281 | * we will fail miseralby and die since we can't handle that case. | ||
282 | */ | ||
283 | int pci_set_dma_mask(struct pci_dev *dev, u64 mask) | ||
284 | { | ||
285 | dev_dbg(&dev->dev, "%s: %llx\n", __func__, mask); | ||
286 | if (mask >= PHYS_OFFSET + SZ_64M - 1) | ||
287 | return 0; | ||
288 | |||
289 | return -EIO; | ||
290 | } | ||
291 | |||
292 | int | ||
293 | pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask) | ||
294 | { | ||
295 | dev_dbg(&dev->dev, "%s: %llx\n", __func__, mask); | ||
296 | if (mask >= PHYS_OFFSET + SZ_64M - 1) | ||
297 | return 0; | ||
298 | |||
299 | return -EIO; | ||
300 | } | ||
301 | |||
302 | int __init it8152_pci_setup(int nr, struct pci_sys_data *sys) | 275 | int __init it8152_pci_setup(int nr, struct pci_sys_data *sys) |
303 | { | 276 | { |
304 | it8152_io.start = IT8152_IO_BASE + 0x12000; | 277 | it8152_io.start = IT8152_IO_BASE + 0x12000; |