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

Commit 884571f0 authored by Huaisheng Ye's avatar Huaisheng Ye Committed by Christoph Hellwig
Browse files

dma-mapping: remove unused gfp_t parameter to arch_dma_alloc_attrs 



Signed-off-by: default avatarHuaisheng Ye <yehs1@lenovo.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 78c47830

arch/x86/include/asm/dma-mapping.h

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus) 
int arch_dma_supported(struct device *dev, u64 mask);

#define arch_dma_supported arch_dma_supported



bool arch_dma_alloc_attrs(struct device **dev, gfp_t *gfp);

bool arch_dma_alloc_attrs(struct device **dev);

#define arch_dma_alloc_attrs arch_dma_alloc_attrs



#endif

arch/x86/kernel/pci-dma.c

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ void __init pci_iommu_alloc(void) 
	}

}



bool arch_dma_alloc_attrs(struct device **dev, gfp_t *gfp)

bool arch_dma_alloc_attrs(struct device **dev)

{

	if (!*dev)

		*dev = &x86_dma_fallback_dev;

include/linux/dma-mapping.h

+2 −2
Original line number Diff line number Diff line
@@ -502,7 +502,7 @@ dma_get_sgtable_attrs(struct device *dev, struct sg_table *sgt, void *cpu_addr, 
#define dma_get_sgtable(d, t, v, h, s) dma_get_sgtable_attrs(d, t, v, h, s, 0)



#ifndef arch_dma_alloc_attrs

#define arch_dma_alloc_attrs(dev, flag)	(true)

#define arch_dma_alloc_attrs(dev)	(true)

#endif



static inline void *dma_alloc_attrs(struct device *dev, size_t size,
@@ -521,7 +521,7 @@ static inline void *dma_alloc_attrs(struct device *dev, size_t size, 
	/* let the implementation decide on the zone to allocate from: */

	flag &= ~(__GFP_DMA | __GFP_DMA32 | __GFP_HIGHMEM);



	if (!arch_dma_alloc_attrs(&dev, &flag))

	if (!arch_dma_alloc_attrs(&dev))

		return NULL;

	if (!ops->alloc)

		return NULL;