summaryrefslogtreecommitdiffstats
path: root/include/linux/amba
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-06-27 10:25:33 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-10-31 14:48:38 +0000
commit446b2a9380b64b9d7410d86ee8226031e03645cf (patch)
tree1bd25472bcd24d88d1fbaf0b35bc05ebee8441d4 /include/linux/amba
parent01edb5e12c7fd2170b1969a455442e8fd17cfe54 (diff)
downloadblackbird-op-linux-446b2a9380b64b9d7410d86ee8226031e03645cf.tar.gz
blackbird-op-linux-446b2a9380b64b9d7410d86ee8226031e03645cf.zip
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.h2
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 {
struct device dev;
struct resource res;
struct clk *pclk;
- u64 dma_mask;
unsigned int periphid;
unsigned int irq[AMBA_NR_IRQS];
};
@@ -131,7 +130,6 @@ struct amba_device name##_device = { \
struct amba_device name##_device = { \
.dev = __AMBA_DEV(busid, data, ~0ULL), \
.res = DEFINE_RES_MEM(base, SZ_4K), \
- .dma_mask = ~0ULL, \
.irq = irqs, \
.periphid = id, \
}
OpenPOWER on IntegriCloud