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

Commit 698915e4 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "arm64/dma-mapping: Remove extraneous null-pointer checks"

parents 212fe57e 6dff252b

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

+0 −2
Original line number Diff line number Diff line
@@ -65,8 +65,6 @@ void arch_teardown_dma_ops(struct device *dev); 
/* do not use this function in a driver */

static inline bool is_device_dma_coherent(struct device *dev)

{

	if (!dev)

		return false;

	return dev->archdata.dma_coherent;

}

arch/arm64/mm/dma-mapping.c

+0 −9
Original line number Diff line number Diff line
@@ -157,11 +157,6 @@ static void *__dma_alloc_coherent(struct device *dev, size_t size, 
				  dma_addr_t *dma_handle, gfp_t flags,

				  unsigned long attrs)

{

	if (dev == NULL) {

		WARN_ONCE(1, "Use an actual device structure for DMA allocation\n");

		return NULL;

	}



	if (IS_ENABLED(CONFIG_ZONE_DMA) &&

	    dev->coherent_dma_mask <= DMA_BIT_MASK(32))

		flags |= GFP_DMA;
@@ -201,10 +196,6 @@ static void __dma_free_coherent(struct device *dev, size_t size, 
	phys_addr_t paddr = dma_to_phys(dev, dma_handle);



	size = PAGE_ALIGN(size);

	if (dev == NULL) {

		WARN_ONCE(1, "Use an actual device structure for DMA allocation\n");

		return;

	}



	if ((attrs & DMA_ATTR_NO_KERNEL_MAPPING) ||

	    (attrs & DMA_ATTR_STRONGLY_ORDERED))