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

Commit 43e4f7ae authored by David Daney's avatar David Daney Committed by Ralf Baechle
Browse files

MIPS: ip32, ip27, jazz: Make static functions in dma-coherence.h inline. 



Any function defined in a header file should be inline.  This helps us
avoid 'unused' compiler warnings when we include the files in more
places in subsequent patches.

Signed-off-by: default avatarDavid Daney <ddaney@caviumnetworks.com>
Patchwork: http://patchwork.linux-mips.org/patch/1636/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent f00e001e

arch/mips/include/asm/mach-ip27/dma-coherence.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -26,14 +26,14 @@ static inline dma_addr_t plat_map_dma_mem(struct device *dev, void *addr, 
	return pa;

	return pa;

}

}





static dma_addr_t plat_map_dma_mem_page(struct device *dev, struct page *page)

static inline dma_addr_t plat_map_dma_mem_page(struct device *dev, struct page *page)

{

{

	dma_addr_t pa = dev_to_baddr(dev, page_to_phys(page));

	dma_addr_t pa = dev_to_baddr(dev, page_to_phys(page));





	return pa;

	return pa;

}

}





static unsigned long plat_dma_addr_to_phys(struct device *dev,

static inline unsigned long plat_dma_addr_to_phys(struct device *dev,

	dma_addr_t dma_addr)

	dma_addr_t dma_addr)

{

{

	return dma_addr & ~(0xffUL << 56);

	return dma_addr & ~(0xffUL << 56);

arch/mips/include/asm/mach-ip32/dma-coherence.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -37,7 +37,7 @@ static inline dma_addr_t plat_map_dma_mem(struct device *dev, void *addr, 
	return pa;

	return pa;

}

}





static dma_addr_t plat_map_dma_mem_page(struct device *dev, struct page *page)

static inline dma_addr_t plat_map_dma_mem_page(struct device *dev, struct page *page)

{

{

	dma_addr_t pa;

	dma_addr_t pa;
@@ -50,7 +50,7 @@ static dma_addr_t plat_map_dma_mem_page(struct device *dev, struct page *page) 
}

}





/* This is almost certainly wrong but it's what dma-ip32.c used to use  */

/* This is almost certainly wrong but it's what dma-ip32.c used to use  */

static unsigned long plat_dma_addr_to_phys(struct device *dev,

static inline unsigned long plat_dma_addr_to_phys(struct device *dev,

	dma_addr_t dma_addr)

	dma_addr_t dma_addr)

{

{

	unsigned long addr = dma_addr & RAM_OFFSET_MASK;

	unsigned long addr = dma_addr & RAM_OFFSET_MASK;

arch/mips/include/asm/mach-jazz/dma-coherence.h

+4 −4
Original line number Original line Diff line number Diff line
@@ -12,23 +12,23 @@ 




struct device;

struct device;





static dma_addr_t plat_map_dma_mem(struct device *dev, void *addr, size_t size)

static inline dma_addr_t plat_map_dma_mem(struct device *dev, void *addr, size_t size)

{

{

	return vdma_alloc(virt_to_phys(addr), size);

	return vdma_alloc(virt_to_phys(addr), size);

}

}





static dma_addr_t plat_map_dma_mem_page(struct device *dev, struct page *page)

static inline dma_addr_t plat_map_dma_mem_page(struct device *dev, struct page *page)

{

{

	return vdma_alloc(page_to_phys(page), PAGE_SIZE);

	return vdma_alloc(page_to_phys(page), PAGE_SIZE);

}

}





static unsigned long plat_dma_addr_to_phys(struct device *dev,

static inline unsigned long plat_dma_addr_to_phys(struct device *dev,

	dma_addr_t dma_addr)

	dma_addr_t dma_addr)

{

{

	return vdma_log2phys(dma_addr);

	return vdma_log2phys(dma_addr);

}

}





static void plat_unmap_dma_mem(struct device *dev, dma_addr_t dma_addr,

static inline void plat_unmap_dma_mem(struct device *dev, dma_addr_t dma_addr,

	size_t size, enum dma_data_direction direction)

	size_t size, enum dma_data_direction direction)

{

{

	vdma_free(dma_addr);

	vdma_free(dma_addr);