mirror of
https://github.com/torvalds/linux.git
synced 2024-11-11 22:51:42 +00:00
dma-mapping: remove dma_configure
There is no good reason for this indirection given that the method always exists. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Robin Murphy <robin.murphy@arm.com>
This commit is contained in:
parent
58643a3a80
commit
ccf640f4c9
@ -480,9 +480,11 @@ re_probe:
|
|||||||
if (ret)
|
if (ret)
|
||||||
goto pinctrl_bind_failed;
|
goto pinctrl_bind_failed;
|
||||||
|
|
||||||
ret = dma_configure(dev);
|
if (dev->bus->dma_configure) {
|
||||||
|
ret = dev->bus->dma_configure(dev);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto dma_failed;
|
goto dma_failed;
|
||||||
|
}
|
||||||
|
|
||||||
if (driver_sysfs_add(dev)) {
|
if (driver_sysfs_add(dev)) {
|
||||||
printk(KERN_ERR "%s: driver_sysfs_add(%s) failed\n",
|
printk(KERN_ERR "%s: driver_sysfs_add(%s) failed\n",
|
||||||
|
@ -754,14 +754,8 @@ dma_mark_declared_memory_occupied(struct device *dev,
|
|||||||
#endif /* CONFIG_HAVE_GENERIC_DMA_COHERENT */
|
#endif /* CONFIG_HAVE_GENERIC_DMA_COHERENT */
|
||||||
|
|
||||||
#ifdef CONFIG_HAS_DMA
|
#ifdef CONFIG_HAS_DMA
|
||||||
int dma_configure(struct device *dev);
|
|
||||||
void dma_deconfigure(struct device *dev);
|
void dma_deconfigure(struct device *dev);
|
||||||
#else
|
#else
|
||||||
static inline int dma_configure(struct device *dev)
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void dma_deconfigure(struct device *dev) {}
|
static inline void dma_deconfigure(struct device *dev) {}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -328,16 +328,6 @@ void dma_common_free_remap(void *cpu_addr, size_t size, unsigned long vm_flags)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
|
||||||
* enables DMA API use for a device
|
|
||||||
*/
|
|
||||||
int dma_configure(struct device *dev)
|
|
||||||
{
|
|
||||||
if (dev->bus->dma_configure)
|
|
||||||
return dev->bus->dma_configure(dev);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void dma_deconfigure(struct device *dev)
|
void dma_deconfigure(struct device *dev)
|
||||||
{
|
{
|
||||||
of_dma_deconfigure(dev);
|
of_dma_deconfigure(dev);
|
||||||
|
Loading…
Reference in New Issue
Block a user