Skip to content

Commit

Permalink
microblaze: use asm-generic/pci-dma-compat.h
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
fujita authored and michalsimek committed Oct 21, 2010
1 parent 6d5f2f6 commit b9b12fd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 15 deletions.
2 changes: 2 additions & 0 deletions arch/microblaze/include/asm/pci.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
15 changes: 0 additions & 15 deletions arch/microblaze/pci/pci-common.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit b9b12fd

Please sign in to comment.