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

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

dma-mapping: pci: convert pci_set_dma_mask to call dma_set_mask 



This changes pci_set_dma_mask to call the generic DMA API, dma_set_mask.

pci_set_dma_mask (in drivers/pci/pci.c) does the same things that
dma_set_mask does on all the architectures that use pci_set_dma_mask;
calls dma_supprted and sets dev->dma_mask.  So we safely change
pci_set_dma_mask to simply call dma_set_mask.

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: James Bottomley <James.Bottomley@suse.de>
Cc: David S. Miller <davem@davemloft.net>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Russell King <linux@arm.linux.org.uk>
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 c186caca

drivers/pci/pci.c

+4 −6
Original line number Diff line number Diff line
@@ -2305,12 +2305,10 @@ void pci_msi_off(struct pci_dev *dev) 
int

pci_set_dma_mask(struct pci_dev *dev, u64 mask)

{

	if (!pci_dma_supported(dev, mask))

		return -EIO;



	dev->dma_mask = mask;

	int ret = dma_set_mask(&dev->dev, mask);

	if (ret)

		return ret;

	dev_dbg(&dev->dev, "using %dbit DMA mask\n", fls64(mask));



	return 0;

}