Commit 6e6c70e6 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Linus Torvalds

dma-mapping: powerpc: use generic pci_set_dma_mask and pci_set_consistent_dma_mask

This converts powerpc to use the generic pci_set_dma_mask and
pci_set_consistent_dma_mask (drivers/pci/pci.c).

The generic pci_set_dma_mask does what powerpc's pci_set_dma_mask does.

Unlike powerpc's pci_set_consistent_dma_mask, the gneric
pci_set_consistent_dma_mask sets only coherent_dma_mask.  It doesn't work
for powerpc?  pci_set_consistent_dma_mask API should set only
Signed-off-by: default avatarFUJITA Tomonori <>
Acked-by: default avatarBenjamin Herrenschmidt <>
Cc: Jesse Barnes <>
Cc: Greg KH <>
Cc: Kay Sievers <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent 6a1961f4
......@@ -127,9 +127,6 @@ static inline int dma_supported(struct device *dev, u64 mask)
return dma_ops->dma_supported(dev, mask);
/* We have our own implementation of pci_set_dma_mask() */
static inline int dma_set_mask(struct device *dev, u64 dma_mask)
struct dma_map_ops *dma_ops = get_dma_ops(dev);
......@@ -63,21 +63,6 @@ struct dma_map_ops *get_pci_dma_ops(void)
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;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment