]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
alpha: simplify get_arch_dma_ops
authorChristoph Hellwig <hch@lst.de>
Wed, 9 May 2018 14:04:52 +0000 (16:04 +0200)
committerMatt Turner <mattst88@gmail.com>
Wed, 23 May 2018 01:10:36 +0000 (18:10 -0700)
Remove the dma_ops indirection.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Matt Turner <mattst88@gmail.com>
arch/alpha/include/asm/dma-mapping.h
arch/alpha/kernel/pci_iommu.c

index 76ce923ecca18a022c16e047ae1bd1a2d486bc92..8beeafd4f68e45c8e7e1a6a006719f549cf70ca3 100644 (file)
@@ -2,14 +2,14 @@
 #ifndef _ALPHA_DMA_MAPPING_H
 #define _ALPHA_DMA_MAPPING_H
 
-extern const struct dma_map_ops *dma_ops;
+extern const struct dma_map_ops alpha_pci_ops;
 
 static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)
 {
 #ifdef CONFIG_ALPHA_JENSEN
        return &dma_direct_ops;
 #else
-       return dma_ops;
+       return &alpha_pci_ops;
 #endif
 }
 
index 83b34b9188ea192517ce72a0d9d260abb5b2e2ac..6923b0d9c1e195d1751d19e4335271b40d3c0226 100644 (file)
@@ -950,6 +950,4 @@ const struct dma_map_ops alpha_pci_ops = {
        .mapping_error          = alpha_pci_mapping_error,
        .dma_supported          = alpha_pci_supported,
 };
-
-const struct dma_map_ops *dma_ops = &alpha_pci_ops;
-EXPORT_SYMBOL(dma_ops);
+EXPORT_SYMBOL(alpha_pci_ops);