Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5e82fa2 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Matt Turner
Browse files

alpha: simplify get_arch_dma_ops 



Remove the dma_ops indirection.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMatt Turner <mattst88@gmail.com>
parent 6db61543

arch/alpha/include/asm/dma-mapping.h

+2 −2
Original line number Diff line number Diff line
@@ -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

}

arch/alpha/kernel/pci_iommu.c

+1 −3
Original line number Diff line number Diff line
@@ -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);