Commit b2fcb677 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

sh: simplify get_arch_dma_ops 



Remove the indirection through the dma_ops variable, and just return
nommu_dma_ops directly from get_arch_dma_ops.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarYoshinori Sato <ysato@users.sourceforge.jp>
parent 4d8bde88

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

+2 −3
Original line number Diff line number Diff line
@@ -2,12 +2,11 @@ 
#ifndef __ASM_SH_DMA_MAPPING_H

#define __ASM_SH_DMA_MAPPING_H



extern const struct dma_map_ops *dma_ops;

extern void no_iommu_init(void);

extern const struct dma_map_ops nommu_dma_ops;



static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus)

{

	return dma_ops;

	return &nommu_dma_ops;

}



extern void *dma_generic_alloc_coherent(struct device *dev, size_t size,

arch/sh/kernel/dma-nommu.c

+1 −7
Original line number Diff line number Diff line
@@ -79,10 +79,4 @@ const struct dma_map_ops nommu_dma_ops = { 
	.sync_sg_for_device	= nommu_sync_sg_for_device,

#endif

};



void __init no_iommu_init(void)

{

	if (dma_ops)

		return;

	dma_ops = &nommu_dma_ops;

}
 
EXPORT_SYMBOL(nommu_dma_ops);

arch/sh/mm/consistent.c

+0 −3
Original line number Diff line number Diff line
@@ -20,9 +20,6 @@ 
#include <asm/cacheflush.h>

#include <asm/addrspace.h>



const struct dma_map_ops *dma_ops;

EXPORT_SYMBOL(dma_ops);



void *dma_generic_alloc_coherent(struct device *dev, size_t size,

				 dma_addr_t *dma_handle, gfp_t gfp,

				 unsigned long attrs)

arch/sh/mm/init.c

+0 −10
Original line number Diff line number Diff line
@@ -339,22 +339,12 @@ void __init paging_init(void) 
	free_area_init_nodes(max_zone_pfns);

}



/*

 * Early initialization for any I/O MMUs we might have.

 */

static void __init iommu_init(void)

{

	no_iommu_init();

}



unsigned int mem_init_done = 0;



void __init mem_init(void)

{

	pg_data_t *pgdat;



	iommu_init();



	high_memory = NULL;

	for_each_online_pgdat(pgdat)

		high_memory = max_t(void *, high_memory,