diff options
author | Michal Simek <michal.simek@xilinx.com> | 2014-05-16 07:36:54 -0400 |
---|---|---|
committer | Michal Simek <michal.simek@xilinx.com> | 2014-06-04 00:59:58 -0400 |
commit | 635eca2d31bfc44b519a50e0cdf9ad9125179906 (patch) | |
tree | b42a7a2c65be3066070b230b48d28ebfcc4b630c /arch | |
parent | 193bca5934db1ca1d0ffcedf551030ff5556a07c (diff) |
microblaze: Clean device dma_ops structure
No code is setting up dma_operation for device.
Use dma_direct_ops for all cases.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/microblaze/include/asm/device.h | 2 | ||||
-rw-r--r-- | arch/microblaze/include/asm/dma-mapping.h | 7 |
2 files changed, 0 insertions, 9 deletions
diff --git a/arch/microblaze/include/asm/device.h b/arch/microblaze/include/asm/device.h index eb639b479c7b..aae3b3c6a033 100644 --- a/arch/microblaze/include/asm/device.h +++ b/arch/microblaze/include/asm/device.h | |||
@@ -12,8 +12,6 @@ | |||
12 | struct device_node; | 12 | struct device_node; |
13 | 13 | ||
14 | struct dev_archdata { | 14 | struct dev_archdata { |
15 | /* DMA operations on that device */ | ||
16 | struct dma_map_ops *dma_ops; | ||
17 | }; | 15 | }; |
18 | 16 | ||
19 | struct pdev_archdata { | 17 | struct pdev_archdata { |
diff --git a/arch/microblaze/include/asm/dma-mapping.h b/arch/microblaze/include/asm/dma-mapping.h index cf8056011a0a..48180ea8633a 100644 --- a/arch/microblaze/include/asm/dma-mapping.h +++ b/arch/microblaze/include/asm/dma-mapping.h | |||
@@ -50,16 +50,9 @@ extern struct dma_map_ops dma_direct_ops; | |||
50 | 50 | ||
51 | static inline struct dma_map_ops *get_dma_ops(struct device *dev) | 51 | static inline struct dma_map_ops *get_dma_ops(struct device *dev) |
52 | { | 52 | { |
53 | if (dev && dev->archdata.dma_ops) | ||
54 | return dev->archdata.dma_ops; | ||
55 | return &dma_direct_ops; | 53 | return &dma_direct_ops; |
56 | } | 54 | } |
57 | 55 | ||
58 | static inline void set_dma_ops(struct device *dev, struct dma_map_ops *ops) | ||
59 | { | ||
60 | dev->archdata.dma_ops = ops; | ||
61 | } | ||
62 | |||
63 | static inline int dma_supported(struct device *dev, u64 mask) | 56 | static inline int dma_supported(struct device *dev, u64 mask) |
64 | { | 57 | { |
65 | struct dma_map_ops *ops = get_dma_ops(dev); | 58 | struct dma_map_ops *ops = get_dma_ops(dev); |