projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5348c1e
)
sparc: use generic dma_set_mask
author
Christoph Hellwig
<
[email protected]
>
Wed, 20 Jan 2016 23:01:59 +0000
(15:01 -0800)
committer
Linus Torvalds
<
[email protected]
>
Thu, 21 Jan 2016 01:09:18 +0000
(17:09 -0800)
Sparc already uses the same code as the generic code for the PCI
implementation but just fails the call sbus. This moves to the generic
implemenation which eventually return -EIO due to the NULL dma_mask
pointer in the device.
Signed-off-by: Christoph Hellwig <
[email protected]
>
Cc: "David S. Miller" <
[email protected]
>
Cc: Christian Borntraeger <
[email protected]
>
Cc: Joerg Roedel <
[email protected]
>
Cc: Sebastian Ott <
[email protected]
>
Signed-off-by: Andrew Morton <
[email protected]
>
Signed-off-by: Linus Torvalds <
[email protected]
>
arch/sparc/include/asm/dma-mapping.h
patch
|
blob
|
history
diff --git
a/arch/sparc/include/asm/dma-mapping.h
b/arch/sparc/include/asm/dma-mapping.h
index a21da597b0b59d49cce2f5fcca68a4274bccbfc6..2777092dd851bc81f830e795499b72be8c0bf439 100644
(file)
--- a/
arch/sparc/include/asm/dma-mapping.h
+++ b/
arch/sparc/include/asm/dma-mapping.h
@@
-37,21
+37,6
@@
static inline struct dma_map_ops *get_dma_ops(struct device *dev)
return dma_ops;
}
-#define HAVE_ARCH_DMA_SET_MASK 1
-
-static inline int dma_set_mask(struct device *dev, u64 mask)
-{
-#ifdef CONFIG_PCI
- if (dev->bus == &pci_bus_type) {
- if (!dev->dma_mask || !dma_supported(dev, mask))
- return -EINVAL;
- *dev->dma_mask = mask;
- return 0;
- }
-#endif
- return -EINVAL;
-}
-
#include <asm-generic/dma-mapping-common.h>
#endif