diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-06-27 05:25:33 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-31 10:48:38 -0400 |
commit | 446b2a9380b64b9d7410d86ee8226031e03645cf (patch) | |
tree | 1bd25472bcd24d88d1fbaf0b35bc05ebee8441d4 /include/linux/amba | |
parent | 01edb5e12c7fd2170b1969a455442e8fd17cfe54 (diff) |
DMA-API: amba: get rid of separate dma_mask
AMBA Primecell devices always treat streaming and coherent DMA exactly
the same, so there's no point in having the masks separated.
Acked-by: Grant Likely <grant.likely@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/linux/amba')
-rw-r--r-- | include/linux/amba/bus.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/amba/bus.h b/include/linux/amba/bus.h index 43ec7e247a80..682df0e1954a 100644 --- a/include/linux/amba/bus.h +++ b/include/linux/amba/bus.h | |||
@@ -30,7 +30,6 @@ struct amba_device { | |||
30 | struct device dev; | 30 | struct device dev; |
31 | struct resource res; | 31 | struct resource res; |
32 | struct clk *pclk; | 32 | struct clk *pclk; |
33 | u64 dma_mask; | ||
34 | unsigned int periphid; | 33 | unsigned int periphid; |
35 | unsigned int irq[AMBA_NR_IRQS]; | 34 | unsigned int irq[AMBA_NR_IRQS]; |
36 | }; | 35 | }; |
@@ -131,7 +130,6 @@ struct amba_device name##_device = { \ | |||
131 | struct amba_device name##_device = { \ | 130 | struct amba_device name##_device = { \ |
132 | .dev = __AMBA_DEV(busid, data, ~0ULL), \ | 131 | .dev = __AMBA_DEV(busid, data, ~0ULL), \ |
133 | .res = DEFINE_RES_MEM(base, SZ_4K), \ | 132 | .res = DEFINE_RES_MEM(base, SZ_4K), \ |
134 | .dma_mask = ~0ULL, \ | ||
135 | .irq = irqs, \ | 133 | .irq = irqs, \ |
136 | .periphid = id, \ | 134 | .periphid = id, \ |
137 | } | 135 | } |