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/mach-ixp4xx/common-pci.c | |
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/mach-ixp4xx/common-pci.c')
-rw-r--r-- | arch/arm/mach-ixp4xx/common-pci.c | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/arch/arm/mach-ixp4xx/common-pci.c b/arch/arm/mach-ixp4xx/common-pci.c index c4a01594c761..e3181534c7f9 100644 --- a/arch/arm/mach-ixp4xx/common-pci.c +++ b/arch/arm/mach-ixp4xx/common-pci.c | |||
@@ -502,32 +502,6 @@ struct pci_bus * __devinit ixp4xx_scan_bus(int nr, struct pci_sys_data *sys) | |||
502 | return pci_scan_bus(sys->busnr, &ixp4xx_ops, sys); | 502 | return pci_scan_bus(sys->busnr, &ixp4xx_ops, sys); |
503 | } | 503 | } |
504 | 504 | ||
505 | /* | ||
506 | * We override these so we properly do dmabounce otherwise drivers | ||
507 | * are able to set the dma_mask to 0xffffffff and we can no longer | ||
508 | * trap bounces. :( | ||
509 | * | ||
510 | * We just return true on everyhing except for < 64MB in which case | ||
511 | * we will fail miseralby and die since we can't handle that case. | ||
512 | */ | ||
513 | int | ||
514 | pci_set_dma_mask(struct pci_dev *dev, u64 mask) | ||
515 | { | ||
516 | if (mask >= SZ_64M - 1 ) | ||
517 | return 0; | ||
518 | |||
519 | return -EIO; | ||
520 | } | ||
521 | |||
522 | int | ||
523 | pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask) | ||
524 | { | ||
525 | if (mask >= SZ_64M - 1 ) | ||
526 | return 0; | ||
527 | |||
528 | return -EIO; | ||
529 | } | ||
530 | |||
531 | EXPORT_SYMBOL(ixp4xx_pci_read); | 505 | EXPORT_SYMBOL(ixp4xx_pci_read); |
532 | EXPORT_SYMBOL(ixp4xx_pci_write); | 506 | EXPORT_SYMBOL(ixp4xx_pci_write); |
533 | 507 | ||