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>

diff --git a/arch/microblaze/include/asm/dma-mapping.h b/arch/microblaze/include/asm/dma-mapping.h
index 46460f1c49c44b161cbc3de84f1a6c2b69820661..cf8056011a0aa778acf21d9bb1b44bbd83d33013 100644 (file)
--- 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)

diff --git a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c
index 67cc4b282cc127fb48f2847d601adebab5aaf9e1..ef011295777f5af5925007e118aef2933551a749 100644 (file)
--- a/arch/microblaze/kernel/setup.c
+++ b/arch/microblaze/kernel/setup.c
@@ -229,31 +229,3 @@ static int __init debugfs_tlb(void)
 device_initcall(debugfs_tlb);
 # endif
 #endif
-
-static int dflt_bus_notify(struct notifier_block *nb,
-                               unsigned long action, void *data)
-{
-       struct device *dev = data;
-
-       /* We are only intereted in device addition */
-       if (action != BUS_NOTIFY_ADD_DEVICE)
-               return 0;
-
-       set_dma_ops(dev, &dma_direct_ops);
-
-       return NOTIFY_DONE;
-}
-
-static struct notifier_block dflt_plat_bus_notifier = {
-       .notifier_call = dflt_bus_notify,
-       .priority = INT_MAX,
-};
-
-static int __init setup_bus_notifier(void)
-{
-       bus_register_notifier(&platform_bus_type, &dflt_plat_bus_notifier);
-
-       return 0;
-}
-
-arch_initcall(setup_bus_notifier);