Commit 4e1003aa authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

dma-direct: remove the dma_handle argument to __dma_direct_alloc_pages 



The argument isn't used anywhere, so stop passing it.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
parent acaade1a

include/linux/dma-direct.h

+1 −1
Original line number Diff line number Diff line
@@ -67,6 +67,6 @@ void *dma_direct_alloc_pages(struct device *dev, size_t size, 
void dma_direct_free_pages(struct device *dev, size_t size, void *cpu_addr,

		dma_addr_t dma_addr, unsigned long attrs);

struct page *__dma_direct_alloc_pages(struct device *dev, size_t size,

		dma_addr_t *dma_handle, gfp_t gfp, unsigned long attrs);

		gfp_t gfp, unsigned long attrs);

int dma_direct_supported(struct device *dev, u64 mask);

#endif /* _LINUX_DMA_DIRECT_H */

kernel/dma/direct.c

+2 −2
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static bool dma_coherent_ok(struct device *dev, phys_addr_t phys, size_t size) 
}



struct page *__dma_direct_alloc_pages(struct device *dev, size_t size,

		dma_addr_t *dma_handle, gfp_t gfp, unsigned long attrs)

		gfp_t gfp, unsigned long attrs)

{

	size_t alloc_size = PAGE_ALIGN(size);

	int node = dev_to_node(dev);
@@ -131,7 +131,7 @@ void *dma_direct_alloc_pages(struct device *dev, size_t size, 
	struct page *page;

	void *ret;



	page = __dma_direct_alloc_pages(dev, size, dma_handle, gfp, attrs);

	page = __dma_direct_alloc_pages(dev, size, gfp, attrs);

	if (!page)

		return NULL;

kernel/dma/remap.c

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ void *arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle, 
		goto done;

	}



	page = __dma_direct_alloc_pages(dev, size, dma_handle, flags, attrs);

	page = __dma_direct_alloc_pages(dev, size, flags, attrs);

	if (!page)

		return NULL;