summaryrefslogtreecommitdiff
path: root/arch/microblaze/include/asm/dma-mapping.h
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2014-05-16 12:56:53 +0200
committerMichal Simek <michal.simek@xilinx.com>2014-06-04 06:59:55 +0200
commit3b3b6853bc9502282e7f53c117a18f20f0581fd9 (patch)
treedde2c9b49fdd4e28df0d99adc8d29711aa87d0d6 /arch/microblaze/include/asm/dma-mapping.h
parenta44e437ac63184aaeb7cd8f76fb8907c75842f29 (diff)
microblaze: Return default dma operations
Return Microblaze default dma operations and remove bus notifier which setups the same dma operations by default when device is added to the system. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'arch/microblaze/include/asm/dma-mapping.h')
-rw-r--r--arch/microblaze/include/asm/dma-mapping.h14
1 files changed, 3 insertions, 11 deletions
diff --git a/arch/microblaze/include/asm/dma-mapping.h b/arch/microblaze/include/asm/dma-mapping.h
index 46460f1c49c4..cf8056011a0a 100644
--- a/arch/microblaze/include/asm/dma-mapping.h
+++ b/arch/microblaze/include/asm/dma-mapping.h
@@ -43,8 +43,6 @@ static inline unsigned long device_to_mask(struct device *dev)
return 0xfffffffful;
}
-extern struct dma_map_ops *dma_ops;
-
/*
* Available generic sets of operations
*/
@@ -52,15 +50,9 @@ extern struct dma_map_ops dma_direct_ops;
static inline struct dma_map_ops *get_dma_ops(struct device *dev)
{
- /* We don't handle the NULL dev case for ISA for now. We could
- * do it via an out of line call but it is not needed for now. The
- * 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) || !dev->archdata.dma_ops)
- return NULL;
-
- return dev->archdata.dma_ops;
+ if (dev && dev->archdata.dma_ops)
+ return dev->archdata.dma_ops;
+ return &dma_direct_ops;
}
static inline void set_dma_ops(struct device *dev, struct dma_map_ops *ops)