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

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

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
coherent_dma_mask?

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: Greg KH <greg@kroah.com>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6a1961f4

arch/powerpc/include/asm/dma-mapping.h

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

#define HAVE_ARCH_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);

arch/powerpc/kernel/pci-common.c

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