diff options
author | Michal Simek <michal.simek@xilinx.com> | 2014-05-16 07:29:45 -0400 |
---|---|---|
committer | Michal Simek <michal.simek@xilinx.com> | 2014-06-04 00:59:56 -0400 |
commit | 28d1880c6872af3d1c17bc46da5795b9eba04bee (patch) | |
tree | bec56ee411c3cf66925f11cfcf825e5cfd0a2585 /arch/microblaze/pci | |
parent | 3b3b6853bc9502282e7f53c117a18f20f0581fd9 (diff) |
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/pci')
-rw-r--r-- | arch/microblaze/pci/pci-common.c | 16 |
1 files changed, 0 insertions, 16 deletions
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 */ | |||
47 | /* ISA Memory physical address */ | 47 | /* ISA Memory physical address */ |
48 | resource_size_t isa_mem_base; | 48 | resource_size_t isa_mem_base; |
49 | 49 | ||
50 | static struct dma_map_ops *pci_dma_ops = &dma_direct_ops; | ||
51 | |||
52 | unsigned long isa_io_base; | 50 | unsigned long isa_io_base; |
53 | unsigned long pci_dram_offset; | 51 | unsigned long pci_dram_offset; |
54 | static int pci_bus_count; | 52 | static int pci_bus_count; |
55 | 53 | ||
56 | |||
57 | void set_pci_dma_ops(struct dma_map_ops *dma_ops) | ||
58 | { | ||
59 | pci_dma_ops = dma_ops; | ||
60 | } | ||
61 | |||
62 | struct dma_map_ops *get_pci_dma_ops(void) | ||
63 | { | ||
64 | return pci_dma_ops; | ||
65 | } | ||
66 | EXPORT_SYMBOL(get_pci_dma_ops); | ||
67 | |||
68 | struct pci_controller *pcibios_alloc_controller(struct device_node *dev) | 54 | struct pci_controller *pcibios_alloc_controller(struct device_node *dev) |
69 | { | 55 | { |
70 | struct pci_controller *phb; | 56 | struct pci_controller *phb; |
@@ -886,8 +872,6 @@ void pcibios_setup_bus_devices(struct pci_bus *bus) | |||
886 | */ | 872 | */ |
887 | set_dev_node(&dev->dev, pcibus_to_node(dev->bus)); | 873 | set_dev_node(&dev->dev, pcibus_to_node(dev->bus)); |
888 | 874 | ||
889 | /* Hook up default DMA ops */ | ||
890 | set_dma_ops(&dev->dev, pci_dma_ops); | ||
891 | dev->dev.archdata.dma_data = (void *)PCI_DRAM_OFFSET; | 875 | dev->dev.archdata.dma_data = (void *)PCI_DRAM_OFFSET; |
892 | 876 | ||
893 | /* Read default IRQs and fixup if necessary */ | 877 | /* Read default IRQs and fixup if necessary */ |