Patchwork [v2,1/3] powerpc/pci: Default to dma_direct_ops for pci dma_ops

login
register
mail settings
Submitter Kumar Gala
Date March 19, 2009, 1:40 p.m.
Message ID <1237470052-4071-1-git-send-email-galak@kernel.crashing.org>
Download mbox | patch
Permalink /patch/24677/
State Accepted, archived
Delegated to: Benjamin Herrenschmidt
Headers show

Comments

Kumar Gala - March 19, 2009, 1:40 p.m.
This will allow us to remove the ppc32 specific checks in get_dma_ops()
that defaults to dma_direct_ops if the archdata is NULL.  We really
should always have archdata set to something going forward.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
 arch/powerpc/kernel/pci-common.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Benjamin Krill - March 20, 2009, 7:37 a.m.
* Kumar Gala | 2009-03-19 08:40:50 [-0500]:

>This will allow us to remove the ppc32 specific checks in get_dma_ops()
>that defaults to dma_direct_ops if the archdata is NULL.  We really
>should always have archdata set to something going forward.
>
>Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

Acked-by: Benjamin Krill <ben@codiert.org>

Tested on QPACE node card.

Patch

diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index 2603f20..9c69e7e 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -50,7 +50,7 @@  resource_size_t isa_mem_base;
 unsigned int ppc_pci_flags = 0;
 
 
-static struct dma_mapping_ops *pci_dma_ops;
+static struct dma_mapping_ops *pci_dma_ops = &dma_direct_ops;
 
 void set_pci_dma_ops(struct dma_mapping_ops *dma_ops)
 {