dma-direct: remove the dma_handle argument to __dma_direct_alloc_pages

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

Christoph Hellwig committed 7 years ago

Commit 4e1003a1 parent acaade13 files · +4 −4Browse files

Unified · Split

3 files

include/linux/dma-direct.h +1 −1
kernel/dma/direct.c +2 −2
kernel/dma/remap.c +1 −1

include/linux/dma-direct.h+1−1

@@ -67,6 +67,6 @@ void dma_direct_alloc_pages(struct device dev, size_t size, · 66 unmodified lines
67	void dma_direct_free_pages(struct device dev, size_t size, void cpu_addr,	67	void dma_direct_free_pages(struct device dev, size_t size, void cpu_addr,
68	dma_addr_t dma_addr, unsigned long attrs);	68	dma_addr_t dma_addr, unsigned long attrs);
69	struct page __dma_direct_alloc_pages(struct device dev, size_t size,	69	struct page __dma_direct_alloc_pages(struct device dev, size_t size,
70	dma_addr_t *dma_handle, gfp_t gfp, unsigned long attrs);	70	gfp_t gfp, unsigned long attrs);
71	int dma_direct_supported(struct device *dev, u64 mask);	71	int dma_direct_supported(struct device *dev, u64 mask);
72	#endif /* _LINUX_DMA_DIRECT_H */	72	#endif /* _LINUX_DMA_DIRECT_H */

kernel/dma/direct.c+2−2

@@ -83,7 +83,7 @@ static bool dma_coherent_ok(struct device *dev, phys_addr_t phys, size_t size) · 82 unmodified lines
83	}	83	}
84		84
85	struct page __dma_direct_alloc_pages(struct device dev, size_t size,	85	struct page __dma_direct_alloc_pages(struct device dev, size_t size,
86	dma_addr_t *dma_handle, gfp_t gfp, unsigned long attrs)	86	gfp_t gfp, unsigned long attrs)
87	{	87	{
88	size_t alloc_size = PAGE_ALIGN(size);	88	size_t alloc_size = PAGE_ALIGN(size);
89	int node = dev_to_node(dev);	89	int node = dev_to_node(dev);
@@ -131,7 +131,7 @@ void dma_direct_alloc_pages(struct device dev, size_t size, · 41 unmodified lines
131	struct page *page;	131	struct page *page;
132	void *ret;	132	void *ret;
133		133
134	page = __dma_direct_alloc_pages(dev, size, dma_handle, gfp, attrs);	134	page = __dma_direct_alloc_pages(dev, size, gfp, attrs);
135	if (!page)	135	if (!page)
136	return NULL;	136	return NULL;
137		137

kernel/dma/remap.c+1−1

@@ -226,7 +226,7 @@ void arch_dma_alloc(struct device dev, size_t size, dma_addr_t *dma_handle, · 225 unmodified lines
226	goto done;	226	goto done;
227	}	227	}
228		228
229	page = __dma_direct_alloc_pages(dev, size, dma_handle, flags, attrs);	229	page = __dma_direct_alloc_pages(dev, size, flags, attrs);
230	if (!page)	230	if (!page)
231	return NULL;	231	return NULL;
232		232