From 0b8c22e7e52ff877b32e34d969681d41af7b3c5b Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Thu, 19 Mar 2009 03:40:52 +0000 Subject: [PATCH] --- yaml --- r: 138572 b: refs/heads/master c: 4ae0ff606e848fa4957ebf8f97e5db5fdeec27be h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/include/asm/dma-mapping.h | 12 +----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index a8d810d7c9db..2a891e3ef6c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d746286c1fcb186ce16295c30d48db852ede6772 +refs/heads/master: 4ae0ff606e848fa4957ebf8f97e5db5fdeec27be diff --git a/trunk/arch/powerpc/include/asm/dma-mapping.h b/trunk/arch/powerpc/include/asm/dma-mapping.h index 86cef7ddc8d5..c69f2b5f0cc4 100644 --- a/trunk/arch/powerpc/include/asm/dma-mapping.h +++ b/trunk/arch/powerpc/include/asm/dma-mapping.h @@ -109,18 +109,8 @@ static inline struct dma_mapping_ops *get_dma_ops(struct device *dev) * only ISA DMA device we support is the floppy and we have a hack * in the floppy driver directly to get a device for us. */ - - if (unlikely(dev == NULL) || dev->archdata.dma_ops == NULL) { -#ifdef CONFIG_PPC64 + if (unlikely(dev == NULL)) return NULL; -#else - /* Use default on 32-bit if dma_ops is not set up */ - /* TODO: Long term, we should fix drivers so that dev and - * archdata dma_ops are set up for all buses. - */ - return &dma_direct_ops; -#endif - } return dev->archdata.dma_ops; }