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

Commit 4fa5518c authored by Eric Miao's avatar Eric Miao
Browse files

[ARM] pxa: remove now unnecessary dma_needs_bounce() 



With a correct dev->dma_mask before calling dmabounce_register_dev(),
dma_needs_bounce() is not necessary.

The sa1111, though, is a bit complicated. Until it's fully understood
and fixed, dma_needs_bounce() for sa1111 is kept if CONFIG_SA1111 is
enabled with no side effect (with the condition of machine_is_*)

Thanks for Mike Rapoport to fix one error in the original version of
the patch and get this tested.

Acked-by: default avatarMike Rapoport <mike@compulab.co.il>
Signed-off-by: default avatarEric Miao <eric.y.miao@gmail.com>
parent e478fe4c

arch/arm/common/it8152.c

+0 −8
Original line number Diff line number Diff line
@@ -263,14 +263,6 @@ static int it8152_pci_platform_notify_remove(struct device *dev) 
	return 0;

}



int dma_needs_bounce(struct device *dev, dma_addr_t dma_addr, size_t size)

{

	dev_dbg(dev, "%s: dma_addr %08x, size %08x\n",

		__func__, dma_addr, size);

	return (dev->bus == &pci_bus_type) &&

		((dma_addr + size - PHYS_OFFSET) >= SZ_64M);

}



int __init it8152_pci_setup(int nr, struct pci_sys_data *sys)

{

	it8152_io.start = IT8152_IO_BASE + 0x12000;

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

+8 −0
Original line number Diff line number Diff line
@@ -298,7 +298,15 @@ extern void dmabounce_unregister_dev(struct device *); 
 * DMA access and 1 if the buffer needs to be bounced.

 *

 */

#ifdef CONFIG_SA1111

extern int dma_needs_bounce(struct device*, dma_addr_t, size_t);

#else

static inline int dma_needs_bounce(struct device *dev, dma_addr_t addr,

				   size_t size)

{

	return 0;

}

#endif



/*

 * The DMA API, implemented by dmabounce.c.  See below for descriptions.