diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2014-05-16 07:37:02 -0400 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2014-06-04 00:59:57 -0400 |
| commit | 193bca5934db1ca1d0ffcedf551030ff5556a07c (patch) | |
| tree | e5ae4908176bd9b26f1b73407892d9b64be12410 /arch/microblaze/include | |
| parent | 28d1880c6872af3d1c17bc46da5795b9eba04bee (diff) | |
microblaze: Cleanup PCI_DRAM_OFFSET handling
PCI_DRAM_OFFSET/pci_dram_offset is 0 all the time and there
is no difference for PCI and !PCI cases.
Also remove the whole code which setup archdata.dma_data
which is completely unused.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'arch/microblaze/include')
| -rw-r--r-- | arch/microblaze/include/asm/device.h | 1 | ||||
| -rw-r--r-- | arch/microblaze/include/asm/io.h | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/arch/microblaze/include/asm/device.h b/arch/microblaze/include/asm/device.h index 123b2fe72d01..eb639b479c7b 100644 --- a/arch/microblaze/include/asm/device.h +++ b/arch/microblaze/include/asm/device.h | |||
| @@ -14,7 +14,6 @@ struct device_node; | |||
| 14 | struct dev_archdata { | 14 | struct dev_archdata { |
| 15 | /* DMA operations on that device */ | 15 | /* DMA operations on that device */ |
| 16 | struct dma_map_ops *dma_ops; | 16 | struct dma_map_ops *dma_ops; |
| 17 | void *dma_data; | ||
| 18 | }; | 17 | }; |
| 19 | 18 | ||
| 20 | struct pdev_archdata { | 19 | struct pdev_archdata { |
diff --git a/arch/microblaze/include/asm/io.h b/arch/microblaze/include/asm/io.h index 1e4c3329f62e..433751b2a003 100644 --- a/arch/microblaze/include/asm/io.h +++ b/arch/microblaze/include/asm/io.h | |||
| @@ -19,17 +19,14 @@ | |||
| 19 | #ifndef CONFIG_PCI | 19 | #ifndef CONFIG_PCI |
| 20 | #define _IO_BASE 0 | 20 | #define _IO_BASE 0 |
| 21 | #define _ISA_MEM_BASE 0 | 21 | #define _ISA_MEM_BASE 0 |
| 22 | #define PCI_DRAM_OFFSET 0 | ||
| 23 | #else | 22 | #else |
| 24 | #define _IO_BASE isa_io_base | 23 | #define _IO_BASE isa_io_base |
| 25 | #define _ISA_MEM_BASE isa_mem_base | 24 | #define _ISA_MEM_BASE isa_mem_base |
| 26 | #define PCI_DRAM_OFFSET pci_dram_offset | ||
| 27 | struct pci_dev; | 25 | struct pci_dev; |
| 28 | extern void pci_iounmap(struct pci_dev *dev, void __iomem *); | 26 | extern void pci_iounmap(struct pci_dev *dev, void __iomem *); |
| 29 | #define pci_iounmap pci_iounmap | 27 | #define pci_iounmap pci_iounmap |
| 30 | 28 | ||
| 31 | extern unsigned long isa_io_base; | 29 | extern unsigned long isa_io_base; |
| 32 | extern unsigned long pci_dram_offset; | ||
| 33 | extern resource_size_t isa_mem_base; | 30 | extern resource_size_t isa_mem_base; |
| 34 | #endif | 31 | #endif |
| 35 | 32 | ||
