hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Michal Simek 2014-05-16 12:56:53 +02:00
parent a44e437ac6
commit 3b3b6853bc
2 changed files with 3 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/microblaze/include/asm/dma-mapping.h
View File

@ -43,8 +43,6 @@ static inline unsigned long device_to_mask(struct device *dev)
return 0xfffffffful; return 0xfffffffful;
} }
extern struct dma_map_ops *dma_ops;
/* /*
* Available generic sets of operations * 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) 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 if (dev && dev->archdata.dma_ops)
* do it via an out of line call but it is not needed for now. The return dev->archdata.dma_ops;
* only ISA DMA device we support is the floppy and we have a hack return &dma_direct_ops;
* 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;
} }
static inline void set_dma_ops(struct device *dev, struct dma_map_ops *ops) static inline void set_dma_ops(struct device *dev, struct dma_map_ops *ops)

28
arch/microblaze/kernel/setup.c
View File

@ -229,31 +229,3 @@ static int __init debugfs_tlb(void)
device_initcall(debugfs_tlb); device_initcall(debugfs_tlb);
# endif # endif
#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);