diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-03-04 01:02:41 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-03-08 23:03:25 -0500 |
commit | 57190708f1f52d732d94fa21a8e576302d384d33 (patch) | |
tree | e288959df1d9ed7cb4664ce17b792e065a4d97a1 /arch/powerpc/platforms | |
parent | 9874777016e06ad2df420237963e81389776cb6d (diff) |
[POWERPC] Create and use get_pci_dma_ops()
This allows us to hide pci_dma_ops.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms')
-rw-r--r-- | arch/powerpc/platforms/cell/iommu.c | 4 | ||||
-rw-r--r-- | arch/powerpc/platforms/celleb/iommu.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c index d0e02ea1d538..7c953cc022f6 100644 --- a/arch/powerpc/platforms/cell/iommu.c +++ b/arch/powerpc/platforms/cell/iommu.c | |||
@@ -496,7 +496,7 @@ static void cell_dma_dev_setup(struct device *dev) | |||
496 | struct dev_archdata *archdata = &dev->archdata; | 496 | struct dev_archdata *archdata = &dev->archdata; |
497 | 497 | ||
498 | /* If we run without iommu, no need to do anything */ | 498 | /* If we run without iommu, no need to do anything */ |
499 | if (pci_dma_ops == &dma_direct_ops) | 499 | if (get_pci_dma_ops() == &dma_direct_ops) |
500 | return; | 500 | return; |
501 | 501 | ||
502 | /* Current implementation uses the first window available in that | 502 | /* Current implementation uses the first window available in that |
@@ -530,7 +530,7 @@ static int cell_of_bus_notify(struct notifier_block *nb, unsigned long action, | |||
530 | return 0; | 530 | return 0; |
531 | 531 | ||
532 | /* We use the PCI DMA ops */ | 532 | /* We use the PCI DMA ops */ |
533 | dev->archdata.dma_ops = pci_dma_ops; | 533 | dev->archdata.dma_ops = get_pci_dma_ops(); |
534 | 534 | ||
535 | cell_dma_dev_setup(dev); | 535 | cell_dma_dev_setup(dev); |
536 | 536 | ||
diff --git a/arch/powerpc/platforms/celleb/iommu.c b/arch/powerpc/platforms/celleb/iommu.c index fecc4ffd475e..e94de6a24622 100644 --- a/arch/powerpc/platforms/celleb/iommu.c +++ b/arch/powerpc/platforms/celleb/iommu.c | |||
@@ -80,7 +80,7 @@ static int celleb_of_bus_notify(struct notifier_block *nb, | |||
80 | if (action != BUS_NOTIFY_ADD_DEVICE) | 80 | if (action != BUS_NOTIFY_ADD_DEVICE) |
81 | return 0; | 81 | return 0; |
82 | 82 | ||
83 | dev->archdata.dma_ops = pci_dma_ops; | 83 | dev->archdata.dma_ops = get_pci_dma_ops(); |
84 | 84 | ||
85 | return 0; | 85 | return 0; |
86 | } | 86 | } |