diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2007-07-31 13:11:25 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2007-07-31 13:11:25 +0900 |
| commit | 75c46162be3d0025d448e0b738d6f8b51ff8a6e5 (patch) | |
| tree | a27c712bf4457aef48d6b918aad606148544cbb3 /include | |
| parent | da9d5108f43d63f09b0328a4211f5f404ea05ab0 (diff) | |
sh64: Kill off virt_to_bus()/bus_to_virt().
Follows the SH change.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-sh64/dma-mapping.h | 8 | ||||
| -rw-r--r-- | include/asm-sh64/io.h | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/include/asm-sh64/dma-mapping.h b/include/asm-sh64/dma-mapping.h index c7c0f059cdc..d505f357f81 100644 --- a/include/asm-sh64/dma-mapping.h +++ b/include/asm-sh64/dma-mapping.h @@ -51,11 +51,11 @@ static inline dma_addr_t dma_map_single(struct device *dev, { #if defined(CONFIG_PCI) && !defined(CONFIG_SH_PCIDMA_NONCOHERENT) if (dev->bus == &pci_bus_type) - return virt_to_bus(ptr); + return virt_to_phys(ptr); #endif dma_cache_sync(dev, ptr, size, dir); - return virt_to_bus(ptr); + return virt_to_phys(ptr); } #define dma_unmap_single(dev, addr, size, dir) do { } while (0) @@ -98,7 +98,7 @@ static inline void dma_sync_single(struct device *dev, dma_addr_t dma_handle, if (dev->bus == &pci_bus_type) return; #endif - dma_cache_sync(dev, bus_to_virt(dma_handle), size, dir); + dma_cache_sync(dev, phys_to_virt(dma_handle), size, dir); } static inline void dma_sync_single_range(struct device *dev, @@ -110,7 +110,7 @@ static inline void dma_sync_single_range(struct device *dev, if (dev->bus == &pci_bus_type) return; #endif - dma_cache_sync(dev, bus_to_virt(dma_handle) + offset, size, dir); + dma_cache_sync(dev, phys_to_virt(dma_handle) + offset, size, dir); } static inline void dma_sync_sg(struct device *dev, struct scatterlist *sg, diff --git a/include/asm-sh64/io.h b/include/asm-sh64/io.h index 14d8e7b4bf4..1f37b693192 100644 --- a/include/asm-sh64/io.h +++ b/include/asm-sh64/io.h @@ -31,10 +31,6 @@ #include <asm/page.h> #include <asm-generic/iomap.h> -#define virt_to_bus virt_to_phys -#define bus_to_virt phys_to_virt -#define page_to_bus page_to_phys - /* * Nothing overly special here.. instead of doing the same thing * over and over again, we just define a set of sh64_in/out functions |