Commit ccf640f4 authored Aug 24, 2018 by Christoph Hellwig

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>

parent 58643a3a

drivers/base/dd.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -480,9 +480,11 @@ static int really_probe(struct device dev, struct device_driver drv)
		if (ret)
		goto pinctrl_bind_failed;

		ret = dma_configure(dev);
		if (dev->bus->dma_configure) {
		ret = dev->bus->dma_configure(dev);
		if (ret)
		goto dma_failed;
		}

		if (driver_sysfs_add(dev)) {
		printk(KERN_ERR "%s: driver_sysfs_add(%s) failed\n",

include/linux/dma-mapping.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -754,14 +754,8 @@ dma_mark_declared_memory_occupied(struct device *dev,
		#endif /* CONFIG_HAVE_GENERIC_DMA_COHERENT */

		#ifdef CONFIG_HAS_DMA
		int dma_configure(struct device *dev);
		void dma_deconfigure(struct device *dev);
		#else
		static inline int dma_configure(struct device *dev)
		{
		return 0;
		}

		static inline void dma_deconfigure(struct device *dev) {}
		#endif

kernel/dma/mapping.c

+0 −10

Original line number	Diff line number	Diff line
		@@ -328,16 +328,6 @@ void dma_common_free_remap(void *cpu_addr, size_t size, unsigned long vm_flags)
		}
		#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)
		{
		of_dma_deconfigure(dev);