diff options
| author | Eric Miao <eric.y.miao@gmail.com> | 2010-06-05 15:16:17 +0800 |
|---|---|---|
| committer | Eric Miao <eric.y.miao@gmail.com> | 2010-08-05 14:32:21 +0800 |
| commit | 4fa5518c65df7a2c4b6c58061ac53d0b01228042 (patch) | |
| tree | 3b3d86888f58ca1ef623e91d7bd41fb90ceae289 /arch/arm/include/asm/dma-mapping.h | |
| parent | e478fe4cd50b86e95fadc415438b63fa94060b7d (diff) | |
| download | linux-3.10-4fa5518c65df7a2c4b6c58061ac53d0b01228042.tar.gz linux-3.10-4fa5518c65df7a2c4b6c58061ac53d0b01228042.tar.bz2 linux-3.10-4fa5518c65df7a2c4b6c58061ac53d0b01228042.zip | |
[ARM] pxa: remove now unnecessary dma_needs_bounce()
With a correct dev->dma_mask before calling dmabounce_register_dev(),
dma_needs_bounce() is not necessary.
The sa1111, though, is a bit complicated. Until it's fully understood
and fixed, dma_needs_bounce() for sa1111 is kept if CONFIG_SA1111 is
enabled with no side effect (with the condition of machine_is_*)
Thanks for Mike Rapoport to fix one error in the original version of
the patch and get this tested.
Acked-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm/include/asm/dma-mapping.h')
| -rw-r--r-- | arch/arm/include/asm/dma-mapping.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h index 69ce0727edb..b5ccc6a993d 100644 --- a/arch/arm/include/asm/dma-mapping.h +++ b/arch/arm/include/asm/dma-mapping.h @@ -298,7 +298,15 @@ extern void dmabounce_unregister_dev(struct device *); * DMA access and 1 if the buffer needs to be bounced. * */ +#ifdef CONFIG_SA1111 extern int dma_needs_bounce(struct device*, dma_addr_t, size_t); +#else +static inline int dma_needs_bounce(struct device *dev, dma_addr_t addr, + size_t size) +{ + return 0; +} +#endif /* * The DMA API, implemented by dmabounce.c. See below for descriptions. |