dma-contiguous: remove dma_declare_contiguous (8df40512) · Commits · 戴 / test

arch/arm/mach-davinci/devices-da8xx.c

+10 −6

Original line number	Diff line number	Diff line
		@@ -884,6 +884,7 @@ early_param("rproc_mem", early_rproc_mem);

		void __init da8xx_rproc_reserve_cma(void)
		{
		struct cma *cma;
		int ret;

		if (!rproc_base \|\| !rproc_size) {
		@@ -897,13 +898,16 @@ void __init da8xx_rproc_reserve_cma(void)
		pr_info("%s: reserving 0x%lx @ 0x%lx...\n",
		__func__, rproc_size, (unsigned long)rproc_base);

		ret = dma_declare_contiguous(&da8xx_dsp.dev, rproc_size, rproc_base, 0);
		if (ret)
		pr_err("%s: dma_declare_contiguous failed %d\n", __func__, ret);
		else
		ret = dma_contiguous_reserve_area(rproc_size, rproc_base, 0, &cma,
		true);
		if (ret) {
		pr_err("%s: dma_contiguous_reserve_area failed %d\n",
		__func__, ret);
		return;
		}
		dev_set_cma_area(&da8xx_dsp.dev, cma);
		rproc_mem_inited = true;
		}

		#else

		void __init da8xx_rproc_reserve_cma(void)

+0 −32

Original line number	Diff line number	Diff line
		@@ -83,31 +83,6 @@ int __init dma_contiguous_reserve_area(phys_addr_t size, phys_addr_t base,
		phys_addr_t limit, struct cma **res_cma,
		bool fixed);

		/**
		* dma_declare_contiguous() - reserve area for contiguous memory handling
		* for particular device
		* @dev: Pointer to device structure.
		* @size: Size of the reserved memory.
		* @base: Start address of the reserved memory (optional, 0 for any).
		* @limit: End address of the reserved memory (optional, 0 for any).
		*
		* This function reserves memory for specified device. It should be
		* called by board specific code when early allocator (memblock or bootmem)
		* is still activate.
		*/

		static inline int dma_declare_contiguous(struct device *dev, phys_addr_t size,
		phys_addr_t base, phys_addr_t limit)
		{
		struct cma *cma;
		int ret;
		ret = dma_contiguous_reserve_area(size, base, limit, &cma, true);
		if (ret == 0)
		dev_set_cma_area(dev, cma);

		return ret;
		}

		struct page dma_alloc_from_contiguous(struct device dev, size_t count,
		unsigned int order, bool no_warn);
		bool dma_release_from_contiguous(struct device dev, struct page pages,
		@@ -135,13 +110,6 @@ static inline int dma_contiguous_reserve_area(phys_addr_t size, phys_addr_t base
		return -ENOSYS;
		}

		static inline
		int dma_declare_contiguous(struct device *dev, phys_addr_t size,
		phys_addr_t base, phys_addr_t limit)
		{
		return -ENOSYS;
		}

		static inline
		struct page dma_alloc_from_contiguous(struct device dev, size_t count,
		unsigned int order, bool no_warn)