Merge "drivers: dma-removed: use relaxed memory attributes" (8ca466ba) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/base/dma-removed.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -223,7 +223,7 @@ void removed_alloc(struct device dev, size_t size, dma_addr_t *handle,
		bool skip_zeroing = attrs & DMA_ATTR_SKIP_ZEROING;
		int pageno;
		unsigned long order;
		void *addr = NULL;
		void __iomem *addr = NULL;
		struct removed_region *dma_mem = dev->removed_mem;
		int nbits;
		unsigned int align;
		@@ -261,7 +261,7 @@ void removed_alloc(struct device dev, size_t size, dma_addr_t *handle,
		goto out;
		}

		addr = ioremap(base, size);
		addr = ioremap_wc(base, size);
		if (WARN_ON(!addr)) {
		bitmap_clear(dma_mem->bitmap, pageno, nbits);
		} else {
		@@ -355,10 +355,10 @@ void removed_sync_sg_for_device(struct device *dev,
		{
		}

		void removed_remap(struct device dev, void *cpu_addr, dma_addr_t handle,
		size_t size, unsigned long attrs)
		static void __iomem removed_remap(struct device dev, void *cpu_addr,
		dma_addr_t handle, size_t size, unsigned long attrs)
		{
		return ioremap(handle, size);
		return ioremap_wc(handle, size);
		}

		void removed_unremap(struct device dev, void remapped_address, size_t size)