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

Commit 91a6fda9 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

dma-mapping: remove dma_mark_declared_memory_occupied 



This API is not used anywhere, so remove it.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent ddb26d8e

Documentation/DMA-API.txt

+0 −17
Original line number Diff line number Diff line
@@ -605,23 +605,6 @@ unconditionally having removed all the required structures. It is the 
driver's job to ensure that no parts of this memory region are

currently in use.



::



	void *

	dma_mark_declared_memory_occupied(struct device *dev,

					  dma_addr_t device_addr, size_t size)



This is used to occupy specific regions of the declared space

(dma_alloc_coherent() will hand out the first free region it finds).



device_addr is the *device* address of the region requested.



size is the size (and should be a page-sized multiple).



The return value will be either a pointer to the processor virtual

address of the memory, or an error (via PTR_ERR()) if any part of the

region is occupied.



Part III - Debug drivers use of the DMA-API

-------------------------------------------

include/linux/dma-mapping.h

+0 −9
Original line number Diff line number Diff line
@@ -743,8 +743,6 @@ static inline int dma_get_cache_alignment(void) 
int dma_declare_coherent_memory(struct device *dev, phys_addr_t phys_addr,

				dma_addr_t device_addr, size_t size, int flags);

void dma_release_declared_memory(struct device *dev);

void *dma_mark_declared_memory_occupied(struct device *dev,

					dma_addr_t device_addr, size_t size);

#else

static inline int

dma_declare_coherent_memory(struct device *dev, phys_addr_t phys_addr,
@@ -757,13 +755,6 @@ static inline void 
dma_release_declared_memory(struct device *dev)

{

}



static inline void *

dma_mark_declared_memory_occupied(struct device *dev,

				  dma_addr_t device_addr, size_t size)

{

	return ERR_PTR(-EBUSY);

}

#endif /* CONFIG_DMA_DECLARE_COHERENT */



static inline void *dmam_alloc_coherent(struct device *dev, size_t size,

kernel/dma/coherent.c

+0 −23
Original line number Diff line number Diff line
@@ -137,29 +137,6 @@ void dma_release_declared_memory(struct device *dev) 
}

EXPORT_SYMBOL(dma_release_declared_memory);



void *dma_mark_declared_memory_occupied(struct device *dev,

					dma_addr_t device_addr, size_t size)

{

	struct dma_coherent_mem *mem = dev->dma_mem;

	unsigned long flags;

	int pos, err;



	size += device_addr & ~PAGE_MASK;



	if (!mem)

		return ERR_PTR(-EINVAL);



	spin_lock_irqsave(&mem->spinlock, flags);

	pos = PFN_DOWN(device_addr - dma_get_device_base(dev, mem));

	err = bitmap_allocate_region(mem->bitmap, pos, get_order(size));

	spin_unlock_irqrestore(&mem->spinlock, flags);



	if (err != 0)

		return ERR_PTR(err);

	return mem->virt_base + (pos << PAGE_SHIFT);

}

EXPORT_SYMBOL(dma_mark_declared_memory_occupied);



static void *__dma_alloc_from_coherent(struct dma_coherent_mem *mem,

		ssize_t size, dma_addr_t *dma_handle)

{