treewide: Consolidate set_dma_ops() implementations
Now that all set_dma_ops() implementations are identical (ignoring BUG_ON() statements), remove the architecture specific definitions and add a definition in <linux/dma-mapping.h>. Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Chris Metcalf <cmetcalf@mellanox.com> Cc: David Woodhouse <dwmw2@infradead.org> Cc: linux-arch@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Cc: linuxppc-dev@lists.ozlabs.org Cc: Paul Mackerras <paulus@samba.org> Cc: Russell King <linux@armlinux.org.uk> Signed-off-by: Doug Ledford <dledford@redhat.com>
This commit is contained in:
Родитель
5657933dbb
Коммит
ca6e8e1031
|
@ -31,12 +31,6 @@ static inline const struct dma_map_ops *get_dma_ops(struct device *dev)
|
||||||
return __generic_dma_ops(dev);
|
return __generic_dma_ops(dev);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void set_dma_ops(struct device *dev, const struct dma_map_ops *ops)
|
|
||||||
{
|
|
||||||
BUG_ON(!dev);
|
|
||||||
dev->dma_ops = ops;
|
|
||||||
}
|
|
||||||
|
|
||||||
#define HAVE_ARCH_DMA_SUPPORTED 1
|
#define HAVE_ARCH_DMA_SUPPORTED 1
|
||||||
extern int dma_supported(struct device *dev, u64 mask);
|
extern int dma_supported(struct device *dev, u64 mask);
|
||||||
|
|
||||||
|
|
|
@ -91,11 +91,6 @@ static inline const struct dma_map_ops *get_dma_ops(struct device *dev)
|
||||||
return dev->dma_ops;
|
return dev->dma_ops;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void set_dma_ops(struct device *dev, const struct dma_map_ops *ops)
|
|
||||||
{
|
|
||||||
dev->dma_ops = ops;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* get_dma_offset()
|
* get_dma_offset()
|
||||||
*
|
*
|
||||||
|
|
|
@ -59,11 +59,6 @@ static inline phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr)
|
||||||
|
|
||||||
static inline void dma_mark_clean(void *addr, size_t size) {}
|
static inline void dma_mark_clean(void *addr, size_t size) {}
|
||||||
|
|
||||||
static inline void set_dma_ops(struct device *dev, const struct dma_map_ops *ops)
|
|
||||||
{
|
|
||||||
dev->dma_ops = ops;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)
|
static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)
|
||||||
{
|
{
|
||||||
if (!dev->dma_mask)
|
if (!dev->dma_mask)
|
||||||
|
|
|
@ -164,6 +164,11 @@ int dma_mmap_from_coherent(struct device *dev, struct vm_area_struct *vma,
|
||||||
|
|
||||||
#ifdef CONFIG_HAS_DMA
|
#ifdef CONFIG_HAS_DMA
|
||||||
#include <asm/dma-mapping.h>
|
#include <asm/dma-mapping.h>
|
||||||
|
static inline void set_dma_ops(struct device *dev,
|
||||||
|
const struct dma_map_ops *dma_ops)
|
||||||
|
{
|
||||||
|
dev->dma_ops = dma_ops;
|
||||||
|
}
|
||||||
#else
|
#else
|
||||||
/*
|
/*
|
||||||
* Define the dma api to allow compilation but not linking of
|
* Define the dma api to allow compilation but not linking of
|
||||||
|
|
Загрузка…
Ссылка в новой задаче