diff options
| author | Marek Szyprowski <m.szyprowski@samsung.com> | 2013-07-29 14:31:45 +0200 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-11-18 11:42:30 +0900 |
| commit | ff8a8bb306a7b61ce7e2a4df981f65796d6fe9f0 (patch) | |
| tree | 43ea9d4d0e520b5cb7f336b675bf986368896a3d /arch/x86 | |
| parent | c77d9179716decca1bc39e927acd9086df8ae084 (diff) | |
| download | linux-3.10-ff8a8bb306a7b61ce7e2a4df981f65796d6fe9f0.tar.gz linux-3.10-ff8a8bb306a7b61ce7e2a4df981f65796d6fe9f0.tar.bz2 linux-3.10-ff8a8bb306a7b61ce7e2a4df981f65796d6fe9f0.zip | |
drivers: dma-contiguous: clean source code and prepare for device tree
This patch cleans the initialization of dma contiguous framework. The
all-in-one dma_declare_contiguous() function is now separated into
dma_contiguous_reserve_area() which only steals the the memory from
memblock allocator and dma_contiguous_add_device() function, which
assigns given device to the specified reserved memory area. This improves
the flexibility in defining contiguous memory areas and assigning device
to them, because now it is possible to assign more than one device to
the given contiguous memory area. Such split in initialization procedure
is also required for upcoming device tree support.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Michal Nazarewicz <mina86@mina86.com>
Acked-by: Tomasz Figa <t.figa@samsung.com>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/include/asm/dma-contiguous.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/include/asm/dma-contiguous.h b/arch/x86/include/asm/dma-contiguous.h index c0924165997..b4b38bacb40 100644 --- a/arch/x86/include/asm/dma-contiguous.h +++ b/arch/x86/include/asm/dma-contiguous.h @@ -4,7 +4,6 @@ #ifdef __KERNEL__ #include <linux/types.h> -#include <asm-generic/dma-contiguous.h> static inline void dma_contiguous_early_fixup(phys_addr_t base, unsigned long size) { } |