From 8bec34c631c33989a89bf166d61f84b7749dfa2a Mon Sep 17 00:00:00 2001 From: Russell King Date: Sun, 5 Sep 2010 12:19:50 +0100 Subject: [PATCH] --- yaml --- r: 210432 b: refs/heads/master c: 0485e18bc4112a3b548baa314c24bfbece4d156b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/common/it8152.c | 8 ++++++++ trunk/arch/arm/include/asm/dma-mapping.h | 8 -------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index bc68a294887e..b21150c547e8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 65b4711ff513767341aa1915c822de6ec0de65cb +refs/heads/master: 0485e18bc4112a3b548baa314c24bfbece4d156b diff --git a/trunk/arch/arm/common/it8152.c b/trunk/arch/arm/common/it8152.c index 6c0913562455..7974baacafce 100644 --- a/trunk/arch/arm/common/it8152.c +++ b/trunk/arch/arm/common/it8152.c @@ -263,6 +263,14 @@ static int it8152_pci_platform_notify_remove(struct device *dev) return 0; } +int dma_needs_bounce(struct device *dev, dma_addr_t dma_addr, size_t size) +{ + dev_dbg(dev, "%s: dma_addr %08x, size %08x\n", + __func__, dma_addr, size); + return (dev->bus == &pci_bus_type) && + ((dma_addr + size - PHYS_OFFSET) >= SZ_64M); +} + int __init it8152_pci_setup(int nr, struct pci_sys_data *sys) { it8152_io.start = IT8152_IO_BASE + 0x12000; diff --git a/trunk/arch/arm/include/asm/dma-mapping.h b/trunk/arch/arm/include/asm/dma-mapping.h index c226fe10553e..c568da7dcae4 100644 --- a/trunk/arch/arm/include/asm/dma-mapping.h +++ b/trunk/arch/arm/include/asm/dma-mapping.h @@ -288,15 +288,7 @@ 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.