diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2014-05-16 13:29:45 +0200 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2014-06-04 06:59:56 +0200 |
| commit | 28d1880c6872af3d1c17bc46da5795b9eba04bee (patch) | |
| tree | bec56ee411c3cf66925f11cfcf825e5cfd0a2585 /arch/microblaze | |
| parent | microblaze: Return default dma operations (diff) | |
| download | linux-28d1880c6872af3d1c17bc46da5795b9eba04bee.tar.xz linux-28d1880c6872af3d1c17bc46da5795b9eba04bee.zip | |
microblaze: Do not setup pci_dma_ops
pci_dma_ops are dma_direct_ops which are setup
by default that's why not setup it again.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'arch/microblaze')
| -rw-r--r-- | arch/microblaze/include/asm/pci.h | 8 | ||||
| -rw-r--r-- | arch/microblaze/pci/pci-common.c | 16 |
2 files changed, 0 insertions, 24 deletions
diff --git a/arch/microblaze/include/asm/pci.h b/arch/microblaze/include/asm/pci.h index 935f9bec414a..dea209cccf7f 100644 --- a/arch/microblaze/include/asm/pci.h +++ b/arch/microblaze/include/asm/pci.h @@ -50,14 +50,6 @@ static inline void pcibios_penalize_isa_irq(int irq, int active) } #ifdef CONFIG_PCI -extern void set_pci_dma_ops(struct dma_map_ops *dma_ops); -extern struct dma_map_ops *get_pci_dma_ops(void); -#else /* CONFIG_PCI */ -#define set_pci_dma_ops(d) -#define get_pci_dma_ops() NULL -#endif - -#ifdef CONFIG_PCI static inline void pci_dma_burst_advice(struct pci_dev *pdev, enum pci_dma_burst_strategy *strat, unsigned long *strategy_parameter) diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c index 70996cc66aa2..99ac12ad4b9b 100644 --- a/arch/microblaze/pci/pci-common.c +++ b/arch/microblaze/pci/pci-common.c @@ -47,24 +47,10 @@ static int global_phb_number; /* Global phb counter */ /* ISA Memory physical address */ resource_size_t isa_mem_base; -static struct dma_map_ops *pci_dma_ops = &dma_direct_ops; - unsigned long isa_io_base; unsigned long pci_dram_offset; static int pci_bus_count; - -void set_pci_dma_ops(struct dma_map_ops *dma_ops) -{ - pci_dma_ops = dma_ops; -} - -struct dma_map_ops *get_pci_dma_ops(void) -{ - return pci_dma_ops; -} -EXPORT_SYMBOL(get_pci_dma_ops); - struct pci_controller *pcibios_alloc_controller(struct device_node *dev) { struct pci_controller *phb; @@ -886,8 +872,6 @@ void pcibios_setup_bus_devices(struct pci_bus *bus) */ set_dev_node(&dev->dev, pcibus_to_node(dev->bus)); - /* Hook up default DMA ops */ - set_dma_ops(&dev->dev, pci_dma_ops); dev->dev.archdata.dma_data = (void *)PCI_DRAM_OFFSET; /* Read default IRQs and fixup if necessary */ |