diff options
| author |   Andrzej Pietrasiewicz <andrzej.p@samsung.com> | 2011-12-22 13:58:21 +0100 |
|---|---|---|
| committer |   Marek Szyprowski <m.szyprowski@samsung.com> | 2012-03-28 16:36:36 +0200 |
| commit | 4ce9a91f344d08640ea6e9a6eba0c1b4641ab6a1 (patch) | |
| tree | 7e384975c15461996a5772f893658911d42b6667 /arch/alpha/kernel/pci-noop.c | |
| parent | SPARC: adapt for dma_map_ops changes (diff) | |
| download | linux-dev-4ce9a91f344d08640ea6e9a6eba0c1b4641ab6a1.tar.xz linux-dev-4ce9a91f344d08640ea6e9a6eba0c1b4641ab6a1.zip | |
Alpha: adapt for dma_map_ops changes
Adapt core Alpha architecture code for dma_map_ops changes: replace
alloc/free_coherent with generic alloc/free methods.
Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Matt Turner <mattst88@gmail.com>
Diffstat (limited to 'arch/alpha/kernel/pci-noop.c')
| -rw-r--r-- | arch/alpha/kernel/pci-noop.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/alpha/kernel/pci-noop.c b/arch/alpha/kernel/pci-noop.c index 04eea4894ef3..df24b76f9246 100644 --- a/arch/alpha/kernel/pci-noop.c +++ b/arch/alpha/kernel/pci-noop.c @@ -108,7 +108,8 @@ sys_pciconfig_write(unsigned long bus, unsigned long dfn, } static void *alpha_noop_alloc_coherent(struct device *dev, size_t size, - dma_addr_t *dma_handle, gfp_t gfp) + dma_addr_t *dma_handle, gfp_t gfp, + struct dma_attrs *attrs) { void *ret; @@ -123,7 +124,8 @@ static void *alpha_noop_alloc_coherent(struct device *dev, size_t size, } static void alpha_noop_free_coherent(struct device *dev, size_t size, - void *cpu_addr, dma_addr_t dma_addr) + void *cpu_addr, dma_addr_t dma_addr, + struct dma_attrs *attrs) { free_pages((unsigned long)cpu_addr, get_order(size)); } @@ -174,8 +176,8 @@ static int alpha_noop_set_mask(struct device *dev, u64 mask) } struct dma_map_ops alpha_noop_ops = { - .alloc_coherent = alpha_noop_alloc_coherent, - .free_coherent = alpha_noop_free_coherent, + .alloc = alpha_noop_alloc_coherent, + .free = alpha_noop_free_coherent, .map_page = alpha_noop_map_page, .map_sg = alpha_noop_map_sg, .mapping_error = alpha_noop_mapping_error, |