diff options
Diffstat (limited to 'arch/microblaze/pci/pci-common.c')
| -rw-r--r-- | arch/microblaze/pci/pci-common.c | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c index 55ef532f32be..e363615d6798 100644 --- a/arch/microblaze/pci/pci-common.c +++ b/arch/microblaze/pci/pci-common.c | |||
| @@ -60,21 +60,6 @@ struct dma_map_ops *get_pci_dma_ops(void) | |||
| 60 | } | 60 | } |
| 61 | EXPORT_SYMBOL(get_pci_dma_ops); | 61 | EXPORT_SYMBOL(get_pci_dma_ops); |
| 62 | 62 | ||
| 63 | int pci_set_dma_mask(struct pci_dev *dev, u64 mask) | ||
| 64 | { | ||
| 65 | return dma_set_mask(&dev->dev, mask); | ||
| 66 | } | ||
| 67 | |||
| 68 | int pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask) | ||
| 69 | { | ||
| 70 | int rc; | ||
| 71 | |||
| 72 | rc = dma_set_mask(&dev->dev, mask); | ||
| 73 | dev->dev.coherent_dma_mask = dev->dma_mask; | ||
| 74 | |||
| 75 | return rc; | ||
| 76 | } | ||
| 77 | |||
| 78 | struct pci_controller *pcibios_alloc_controller(struct device_node *dev) | 63 | struct pci_controller *pcibios_alloc_controller(struct device_node *dev) |
| 79 | { | 64 | { |
| 80 | struct pci_controller *phb; | 65 | struct pci_controller *phb; |
| @@ -1075,8 +1060,6 @@ void __devinit pcibios_setup_bus_devices(struct pci_bus *bus) | |||
| 1075 | bus->number, bus->self ? pci_name(bus->self) : "PHB"); | 1060 | bus->number, bus->self ? pci_name(bus->self) : "PHB"); |
| 1076 | 1061 | ||
| 1077 | list_for_each_entry(dev, &bus->devices, bus_list) { | 1062 | list_for_each_entry(dev, &bus->devices, bus_list) { |
| 1078 | struct dev_archdata *sd = &dev->dev.archdata; | ||
| 1079 | |||
| 1080 | /* Setup OF node pointer in archdata */ | 1063 | /* Setup OF node pointer in archdata */ |
| 1081 | dev->dev.of_node = pci_device_to_OF_node(dev); | 1064 | dev->dev.of_node = pci_device_to_OF_node(dev); |
| 1082 | 1065 | ||
| @@ -1086,8 +1069,8 @@ void __devinit pcibios_setup_bus_devices(struct pci_bus *bus) | |||
| 1086 | set_dev_node(&dev->dev, pcibus_to_node(dev->bus)); | 1069 | set_dev_node(&dev->dev, pcibus_to_node(dev->bus)); |
| 1087 | 1070 | ||
| 1088 | /* Hook up default DMA ops */ | 1071 | /* Hook up default DMA ops */ |
| 1089 | sd->dma_ops = pci_dma_ops; | 1072 | set_dma_ops(&dev->dev, pci_dma_ops); |
| 1090 | sd->dma_data = (void *)PCI_DRAM_OFFSET; | 1073 | dev->dev.archdata.dma_data = (void *)PCI_DRAM_OFFSET; |
| 1091 | 1074 | ||
| 1092 | /* Read default IRQs and fixup if necessary */ | 1075 | /* Read default IRQs and fixup if necessary */ |
| 1093 | pci_read_irq_line(dev); | 1076 | pci_read_irq_line(dev); |
