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>

diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index edfc9f0b1180947a701cd08ca7473a6132f03999..65128cf8427c22f015e043e65abad54246d3ef27 100644 (file)
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -480,9 +480,11 @@ re_probe:
        if (ret)
                goto pinctrl_bind_failed;
 
-       ret = dma_configure(dev);
-       if (ret)
-               goto dma_failed;
+       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",

diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index 1db6a6b46d0d3dbdb10dbc74cb9e481345f0a9ef..1c6c7c09bcf28f64a86c7c5e8ed82c81343e2fd7 100644 (file)
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -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
 

diff --git a/kernel/dma/mapping.c b/kernel/dma/mapping.c
index d2a92ddaac4d14c8683433856672fddbace7a4c9..25607ceb4a50d4a12c5d79ac026b4e1df1a04713 100644 (file)
--- a/kernel/dma/mapping.c
+++ b/kernel/dma/mapping.c
@@ -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);