diff options
| author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2010-08-14 16:18:26 +0900 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2010-10-21 15:51:37 +1000 |
| commit | b9b12fd147553676c6b9483bdc9e3eae0b449aa0 (patch) | |
| tree | cfd3ca307b0c6a4fc923aba907ef09a609014726 /arch/microblaze | |
| parent | 6d5f2f6d4114578e2504ed3f675d450cbde5a161 (diff) | |
| download | linux-stable-b9b12fd147553676c6b9483bdc9e3eae0b449aa0.tar.gz linux-stable-b9b12fd147553676c6b9483bdc9e3eae0b449aa0.tar.bz2 linux-stable-b9b12fd147553676c6b9483bdc9e3eae0b449aa0.zip | |
microblaze: use asm-generic/pci-dma-compat.h
Use asm-generic/pci-dma-compat.h instead of the homegrown
pci_set_dma_mask and pci_set_consistent_dma_mask.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Diffstat (limited to 'arch/microblaze')
| -rw-r--r-- | arch/microblaze/include/asm/pci.h | 2 | ||||
| -rw-r--r-- | arch/microblaze/pci/pci-common.c | 15 |
2 files changed, 2 insertions, 15 deletions
diff --git a/arch/microblaze/include/asm/pci.h b/arch/microblaze/include/asm/pci.h index 5a388eeeb28f..2232ff942ba9 100644 --- a/arch/microblaze/include/asm/pci.h +++ b/arch/microblaze/include/asm/pci.h @@ -165,5 +165,7 @@ extern void __init xilinx_pci_init(void); static inline void __init xilinx_pci_init(void) { return; } #endif +#include <asm-generic/pci-dma-compat.h> + #endif /* __KERNEL__ */ #endif /* __ASM_MICROBLAZE_PCI_H */ diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c index 55ef532f32be..2bc57a836d71 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) } EXPORT_SYMBOL(get_pci_dma_ops); -int pci_set_dma_mask(struct pci_dev *dev, u64 mask) -{ - return dma_set_mask(&dev->dev, mask); -} - -int pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask) -{ - int rc; - - rc = dma_set_mask(&dev->dev, mask); - dev->dev.coherent_dma_mask = dev->dma_mask; - - return rc; -} - struct pci_controller *pcibios_alloc_controller(struct device_node *dev) { struct pci_controller *phb; |