diff options
author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2009-08-04 15:08:25 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-08-28 00:24:10 -0400 |
commit | 45223c549273bbb2c6e1bc6e3629174e8765ad01 (patch) | |
tree | 366f61a56de635c73faa1b779fec6694a075eaa8 /arch/powerpc/platforms | |
parent | f726f30e32305a34a203ff975e60885aa7556c6a (diff) |
powerpc: use dma_map_ops struct
This converts uses dma_map_ops struct (in include/linux/dma-mapping.h)
instead of POWERPC homegrown dma_mapping_ops.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: Becky Bruce <beckyb@kernel.crashing.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms')
-rw-r--r-- | arch/powerpc/platforms/cell/iommu.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/ps3/system-bus.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c index 5b34fc211f35..416db17eb18f 100644 --- a/arch/powerpc/platforms/cell/iommu.c +++ b/arch/powerpc/platforms/cell/iommu.c | |||
@@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struct device *dev, u64 mask) | |||
642 | 642 | ||
643 | static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask); | 643 | static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask); |
644 | 644 | ||
645 | struct dma_mapping_ops dma_iommu_fixed_ops = { | 645 | struct dma_map_ops dma_iommu_fixed_ops = { |
646 | .alloc_coherent = dma_fixed_alloc_coherent, | 646 | .alloc_coherent = dma_fixed_alloc_coherent, |
647 | .free_coherent = dma_fixed_free_coherent, | 647 | .free_coherent = dma_fixed_free_coherent, |
648 | .map_sg = dma_fixed_map_sg, | 648 | .map_sg = dma_fixed_map_sg, |
diff --git a/arch/powerpc/platforms/ps3/system-bus.c b/arch/powerpc/platforms/ps3/system-bus.c index 676f989ed4e4..e34b305a7a52 100644 --- a/arch/powerpc/platforms/ps3/system-bus.c +++ b/arch/powerpc/platforms/ps3/system-bus.c | |||
@@ -694,7 +694,7 @@ static int ps3_dma_supported(struct device *_dev, u64 mask) | |||
694 | return mask >= DMA_BIT_MASK(32); | 694 | return mask >= DMA_BIT_MASK(32); |
695 | } | 695 | } |
696 | 696 | ||
697 | static struct dma_mapping_ops ps3_sb_dma_ops = { | 697 | static struct dma_map_ops ps3_sb_dma_ops = { |
698 | .alloc_coherent = ps3_alloc_coherent, | 698 | .alloc_coherent = ps3_alloc_coherent, |
699 | .free_coherent = ps3_free_coherent, | 699 | .free_coherent = ps3_free_coherent, |
700 | .map_sg = ps3_sb_map_sg, | 700 | .map_sg = ps3_sb_map_sg, |
@@ -704,7 +704,7 @@ static struct dma_mapping_ops ps3_sb_dma_ops = { | |||
704 | .unmap_page = ps3_unmap_page, | 704 | .unmap_page = ps3_unmap_page, |
705 | }; | 705 | }; |
706 | 706 | ||
707 | static struct dma_mapping_ops ps3_ioc0_dma_ops = { | 707 | static struct dma_map_ops ps3_ioc0_dma_ops = { |
708 | .alloc_coherent = ps3_alloc_coherent, | 708 | .alloc_coherent = ps3_alloc_coherent, |
709 | .free_coherent = ps3_free_coherent, | 709 | .free_coherent = ps3_free_coherent, |
710 | .map_sg = ps3_ioc0_map_sg, | 710 | .map_sg = ps3_ioc0_map_sg, |