Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28d1880c authored by Michal Simek's avatar Michal Simek
Browse files

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: default avatarMichal Simek <michal.simek@xilinx.com>
parent 3b3b6853

arch/microblaze/include/asm/pci.h

+0 −8
Original line number Diff line number Diff line
@@ -49,14 +49,6 @@ static inline void pcibios_penalize_isa_irq(int irq, int active) 
	/* We don't do dynamic PCI IRQ allocation */

}



#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,

arch/microblaze/pci/pci-common.c

+0 −16
Original line number Diff line number Diff line
@@ -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 */