Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9b12fd1 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Michal Simek
Browse files

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: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
parent 6d5f2f6d

arch/microblaze/include/asm/pci.h

+2 −0
Original line number Diff line number Diff line
@@ -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 */

arch/microblaze/pci/pci-common.c

+0 −15
Original line number Diff line number Diff line
@@ -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;