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

Commit 5c8598fc authored by Russell King's avatar Russell King
Browse files

ARM: dmabounce: no need to check dev->bus type in needs_bounce function 



As the needs_bounce function is passed at DMA bounce register time,
we already know what the device bus type is, so we don't need to check
it each time the needs_bounce function is called.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 0703ed2a

arch/arm/common/it8152.c

+1 −2
Original line number Diff line number Diff line
@@ -247,8 +247,7 @@ static int it8152_needs_bounce(struct device *dev, dma_addr_t dma_addr, size_t s 
{

	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;

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

}



/*

arch/arm/mach-ixp4xx/common-pci.c

+1 −1
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ static int abort_handler(unsigned long addr, unsigned int fsr, struct pt_regs *r 


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

{

	return dev->bus == &pci_bus_type && (dma_addr + size) >= SZ_64M;

	return (dma_addr + size) >= SZ_64M;

}



/*