openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
FUJITA Tomonori 2010-08-14 16:18:26 +09:00 committed by Michal Simek
parent 6d5f2f6d41
commit b9b12fd147
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/microblaze/include/asm/pci.h
View File

@ -165,5 +165,7 @@ extern void __init xilinx_pci_init(void);
static inline void __init xilinx_pci_init(void) { return; } static inline void __init xilinx_pci_init(void) { return; }
#endif #endif
#include <asm-generic/pci-dma-compat.h>
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* __ASM_MICROBLAZE_PCI_H */ #endif /* __ASM_MICROBLAZE_PCI_H */

15
arch/microblaze/pci/pci-common.c
View File

@ -60,21 +60,6 @@ struct dma_map_ops *get_pci_dma_ops(void)
} }
EXPORT_SYMBOL(get_pci_dma_ops); 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 *pcibios_alloc_controller(struct device_node *dev)
{ {
struct pci_controller *phb; struct pci_controller *phb;