diff options
author | Felix Fietkau <nbd@openwrt.org> | 2013-08-15 05:28:30 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2013-10-29 16:24:40 -0400 |
commit | 4e7f72660c39a81cc5745d5c6f23f9500f80d8d8 (patch) | |
tree | f20c6dadb500eddf4f952c0ef6f01c2900e1dc41 /arch/mips | |
parent | 8a8594a738e2e6abcfb9370629ed95035505668f (diff) |
MIPS: Remove unnecessary platform dma helper functions
The semantics stay the same - on Cavium Octeon the functions were dead
code (it overrides the MIPS DMA ops) - on other platforms they contained
no code at all.
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/5720/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h | 12 | ||||
-rw-r--r-- | arch/mips/include/asm/mach-generic/dma-coherence.h | 10 | ||||
-rw-r--r-- | arch/mips/include/asm/mach-ip27/dma-coherence.h | 10 | ||||
-rw-r--r-- | arch/mips/include/asm/mach-ip32/dma-coherence.h | 11 | ||||
-rw-r--r-- | arch/mips/include/asm/mach-jazz/dma-coherence.h | 10 | ||||
-rw-r--r-- | arch/mips/include/asm/mach-loongson/dma-coherence.h | 10 | ||||
-rw-r--r-- | arch/mips/include/asm/mach-powertv/dma-coherence.h | 10 | ||||
-rw-r--r-- | arch/mips/mm/dma-default.c | 4 |
8 files changed, 1 insertions, 76 deletions
diff --git a/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h b/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h index 47fb247f9663..f9f448650505 100644 --- a/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h +++ b/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h | |||
@@ -52,23 +52,11 @@ static inline int plat_dma_supported(struct device *dev, u64 mask) | |||
52 | return 0; | 52 | return 0; |
53 | } | 53 | } |
54 | 54 | ||
55 | static inline void plat_extra_sync_for_device(struct device *dev) | ||
56 | { | ||
57 | BUG(); | ||
58 | } | ||
59 | |||
60 | static inline int plat_device_is_coherent(struct device *dev) | 55 | static inline int plat_device_is_coherent(struct device *dev) |
61 | { | 56 | { |
62 | return 1; | 57 | return 1; |
63 | } | 58 | } |
64 | 59 | ||
65 | static inline int plat_dma_mapping_error(struct device *dev, | ||
66 | dma_addr_t dma_addr) | ||
67 | { | ||
68 | BUG(); | ||
69 | return 0; | ||
70 | } | ||
71 | |||
72 | dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr); | 60 | dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr); |
73 | phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr); | 61 | phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr); |
74 | 62 | ||
diff --git a/arch/mips/include/asm/mach-generic/dma-coherence.h b/arch/mips/include/asm/mach-generic/dma-coherence.h index 74cb99257d5b..a9e8f6b62b0b 100644 --- a/arch/mips/include/asm/mach-generic/dma-coherence.h +++ b/arch/mips/include/asm/mach-generic/dma-coherence.h | |||
@@ -47,16 +47,6 @@ static inline int plat_dma_supported(struct device *dev, u64 mask) | |||
47 | return 1; | 47 | return 1; |
48 | } | 48 | } |
49 | 49 | ||
50 | static inline void plat_extra_sync_for_device(struct device *dev) | ||
51 | { | ||
52 | } | ||
53 | |||
54 | static inline int plat_dma_mapping_error(struct device *dev, | ||
55 | dma_addr_t dma_addr) | ||
56 | { | ||
57 | return 0; | ||
58 | } | ||
59 | |||
60 | static inline int plat_device_is_coherent(struct device *dev) | 50 | static inline int plat_device_is_coherent(struct device *dev) |
61 | { | 51 | { |
62 | #ifdef CONFIG_DMA_COHERENT | 52 | #ifdef CONFIG_DMA_COHERENT |
diff --git a/arch/mips/include/asm/mach-ip27/dma-coherence.h b/arch/mips/include/asm/mach-ip27/dma-coherence.h index 06c441968e6e..4ffddfdb5062 100644 --- a/arch/mips/include/asm/mach-ip27/dma-coherence.h +++ b/arch/mips/include/asm/mach-ip27/dma-coherence.h | |||
@@ -58,16 +58,6 @@ static inline int plat_dma_supported(struct device *dev, u64 mask) | |||
58 | return 1; | 58 | return 1; |
59 | } | 59 | } |
60 | 60 | ||
61 | static inline void plat_extra_sync_for_device(struct device *dev) | ||
62 | { | ||
63 | } | ||
64 | |||
65 | static inline int plat_dma_mapping_error(struct device *dev, | ||
66 | dma_addr_t dma_addr) | ||
67 | { | ||
68 | return 0; | ||
69 | } | ||
70 | |||
71 | static inline int plat_device_is_coherent(struct device *dev) | 61 | static inline int plat_device_is_coherent(struct device *dev) |
72 | { | 62 | { |
73 | return 1; /* IP27 non-cohernet mode is unsupported */ | 63 | return 1; /* IP27 non-cohernet mode is unsupported */ |
diff --git a/arch/mips/include/asm/mach-ip32/dma-coherence.h b/arch/mips/include/asm/mach-ip32/dma-coherence.h index 073f0c4760ba..104cfbc3ed63 100644 --- a/arch/mips/include/asm/mach-ip32/dma-coherence.h +++ b/arch/mips/include/asm/mach-ip32/dma-coherence.h | |||
@@ -80,17 +80,6 @@ static inline int plat_dma_supported(struct device *dev, u64 mask) | |||
80 | return 1; | 80 | return 1; |
81 | } | 81 | } |
82 | 82 | ||
83 | static inline void plat_extra_sync_for_device(struct device *dev) | ||
84 | { | ||
85 | return; | ||
86 | } | ||
87 | |||
88 | static inline int plat_dma_mapping_error(struct device *dev, | ||
89 | dma_addr_t dma_addr) | ||
90 | { | ||
91 | return 0; | ||
92 | } | ||
93 | |||
94 | static inline int plat_device_is_coherent(struct device *dev) | 83 | static inline int plat_device_is_coherent(struct device *dev) |
95 | { | 84 | { |
96 | return 0; /* IP32 is non-cohernet */ | 85 | return 0; /* IP32 is non-cohernet */ |
diff --git a/arch/mips/include/asm/mach-jazz/dma-coherence.h b/arch/mips/include/asm/mach-jazz/dma-coherence.h index 9fc1e9ad7038..949003ef97b3 100644 --- a/arch/mips/include/asm/mach-jazz/dma-coherence.h +++ b/arch/mips/include/asm/mach-jazz/dma-coherence.h | |||
@@ -48,16 +48,6 @@ static inline int plat_dma_supported(struct device *dev, u64 mask) | |||
48 | return 1; | 48 | return 1; |
49 | } | 49 | } |
50 | 50 | ||
51 | static inline void plat_extra_sync_for_device(struct device *dev) | ||
52 | { | ||
53 | } | ||
54 | |||
55 | static inline int plat_dma_mapping_error(struct device *dev, | ||
56 | dma_addr_t dma_addr) | ||
57 | { | ||
58 | return 0; | ||
59 | } | ||
60 | |||
61 | static inline int plat_device_is_coherent(struct device *dev) | 51 | static inline int plat_device_is_coherent(struct device *dev) |
62 | { | 52 | { |
63 | return 0; | 53 | return 0; |
diff --git a/arch/mips/include/asm/mach-loongson/dma-coherence.h b/arch/mips/include/asm/mach-loongson/dma-coherence.h index e1433055fe98..aeb2c05d6145 100644 --- a/arch/mips/include/asm/mach-loongson/dma-coherence.h +++ b/arch/mips/include/asm/mach-loongson/dma-coherence.h | |||
@@ -53,16 +53,6 @@ static inline int plat_dma_supported(struct device *dev, u64 mask) | |||
53 | return 1; | 53 | return 1; |
54 | } | 54 | } |
55 | 55 | ||
56 | static inline void plat_extra_sync_for_device(struct device *dev) | ||
57 | { | ||
58 | } | ||
59 | |||
60 | static inline int plat_dma_mapping_error(struct device *dev, | ||
61 | dma_addr_t dma_addr) | ||
62 | { | ||
63 | return 0; | ||
64 | } | ||
65 | |||
66 | static inline int plat_device_is_coherent(struct device *dev) | 56 | static inline int plat_device_is_coherent(struct device *dev) |
67 | { | 57 | { |
68 | return 0; | 58 | return 0; |
diff --git a/arch/mips/include/asm/mach-powertv/dma-coherence.h b/arch/mips/include/asm/mach-powertv/dma-coherence.h index f8316720a218..5d4c3fe04722 100644 --- a/arch/mips/include/asm/mach-powertv/dma-coherence.h +++ b/arch/mips/include/asm/mach-powertv/dma-coherence.h | |||
@@ -99,16 +99,6 @@ static inline int plat_dma_supported(struct device *dev, u64 mask) | |||
99 | return 1; | 99 | return 1; |
100 | } | 100 | } |
101 | 101 | ||
102 | static inline void plat_extra_sync_for_device(struct device *dev) | ||
103 | { | ||
104 | } | ||
105 | |||
106 | static inline int plat_dma_mapping_error(struct device *dev, | ||
107 | dma_addr_t dma_addr) | ||
108 | { | ||
109 | return 0; | ||
110 | } | ||
111 | |||
112 | static inline int plat_device_is_coherent(struct device *dev) | 102 | static inline int plat_device_is_coherent(struct device *dev) |
113 | { | 103 | { |
114 | return 0; | 104 | return 0; |
diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c index 5f8b95512580..2e9418562258 100644 --- a/arch/mips/mm/dma-default.c +++ b/arch/mips/mm/dma-default.c | |||
@@ -297,7 +297,6 @@ static void mips_dma_sync_single_for_cpu(struct device *dev, | |||
297 | static void mips_dma_sync_single_for_device(struct device *dev, | 297 | static void mips_dma_sync_single_for_device(struct device *dev, |
298 | dma_addr_t dma_handle, size_t size, enum dma_data_direction direction) | 298 | dma_addr_t dma_handle, size_t size, enum dma_data_direction direction) |
299 | { | 299 | { |
300 | plat_extra_sync_for_device(dev); | ||
301 | if (!plat_device_is_coherent(dev)) | 300 | if (!plat_device_is_coherent(dev)) |
302 | __dma_sync(dma_addr_to_page(dev, dma_handle), | 301 | __dma_sync(dma_addr_to_page(dev, dma_handle), |
303 | dma_handle & ~PAGE_MASK, size, direction); | 302 | dma_handle & ~PAGE_MASK, size, direction); |
@@ -327,7 +326,7 @@ static void mips_dma_sync_sg_for_device(struct device *dev, | |||
327 | 326 | ||
328 | int mips_dma_mapping_error(struct device *dev, dma_addr_t dma_addr) | 327 | int mips_dma_mapping_error(struct device *dev, dma_addr_t dma_addr) |
329 | { | 328 | { |
330 | return plat_dma_mapping_error(dev, dma_addr); | 329 | return 0; |
331 | } | 330 | } |
332 | 331 | ||
333 | int mips_dma_supported(struct device *dev, u64 mask) | 332 | int mips_dma_supported(struct device *dev, u64 mask) |
@@ -340,7 +339,6 @@ void dma_cache_sync(struct device *dev, void *vaddr, size_t size, | |||
340 | { | 339 | { |
341 | BUG_ON(direction == DMA_NONE); | 340 | BUG_ON(direction == DMA_NONE); |
342 | 341 | ||
343 | plat_extra_sync_for_device(dev); | ||
344 | if (!plat_device_is_coherent(dev)) | 342 | if (!plat_device_is_coherent(dev)) |
345 | __dma_sync_virtual(vaddr, size, direction); | 343 | __dma_sync_virtual(vaddr, size, direction); |
346 | } | 344 | } |