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

Commit 75c46162 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh64: Kill off virt_to_bus()/bus_to_virt(). 



Follows the SH change.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent da9d5108

arch/sh64/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -47,6 +47,9 @@ config ARCH_HAS_ILOG2_U64 
	bool

	default n



config ARCH_NO_VIRT_TO_BUS

	def_bool y



source init/Kconfig



menu "System type"

arch/sh64/kernel/pci-dma.c

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ void *consistent_alloc(struct pci_dev *hwdev, size_t size, 


	if (vp != NULL) {

		memset(vp, 0, size);

		*dma_handle = virt_to_bus(ret);

		*dma_handle = virt_to_phys(ret);

		dma_cache_wback_inv((unsigned long)ret, size);

	}
@@ -42,7 +42,7 @@ void consistent_free(struct pci_dev *hwdev, size_t size, 
{

	void *alloc;



	alloc = bus_to_virt((unsigned long)dma_handle);

	alloc = phys_to_virt((unsigned long)dma_handle);

	free_pages((unsigned long)alloc, get_order(size));



	iounmap(vaddr);

include/asm-sh64/dma-mapping.h

+4 −4
Original line number Diff line number Diff line
@@ -51,11 +51,11 @@ static inline dma_addr_t dma_map_single(struct device *dev, 
{

#if defined(CONFIG_PCI) && !defined(CONFIG_SH_PCIDMA_NONCOHERENT)

	if (dev->bus == &pci_bus_type)

		return virt_to_bus(ptr);

		return virt_to_phys(ptr);

#endif

	dma_cache_sync(dev, ptr, size, dir);



	return virt_to_bus(ptr);

	return virt_to_phys(ptr);

}



#define dma_unmap_single(dev, addr, size, dir)	do { } while (0)
@@ -98,7 +98,7 @@ static inline void dma_sync_single(struct device *dev, dma_addr_t dma_handle, 
	if (dev->bus == &pci_bus_type)

		return;

#endif

	dma_cache_sync(dev, bus_to_virt(dma_handle), size, dir);

	dma_cache_sync(dev, phys_to_virt(dma_handle), size, dir);

}



static inline void dma_sync_single_range(struct device *dev,
@@ -110,7 +110,7 @@ static inline void dma_sync_single_range(struct device *dev, 
	if (dev->bus == &pci_bus_type)

		return;

#endif

	dma_cache_sync(dev, bus_to_virt(dma_handle) + offset, size, dir);

	dma_cache_sync(dev, phys_to_virt(dma_handle) + offset, size, dir);

}



static inline void dma_sync_sg(struct device *dev, struct scatterlist *sg,

include/asm-sh64/io.h

+0 −4
Original line number Diff line number Diff line
@@ -31,10 +31,6 @@ 
#include <asm/page.h>

#include <asm-generic/iomap.h>



#define virt_to_bus virt_to_phys

#define bus_to_virt phys_to_virt

#define page_to_bus page_to_phys



/*

 * Nothing overly special here.. instead of doing the same thing

 * over and over again, we just define a set of sh64_in/out functions