From 5c8598fca1a359520623ed5409d23bb9e23d7da3 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 4 Jul 2011 08:34:33 +0100
Subject: 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: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/common/it8152.c b/arch/arm/common/it8152.c
index 80b49e1..14ad62e 100644
--- a/arch/arm/common/it8152.c
+++ b/arch/arm/common/it8152.c
@@ -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;
 }
 
 /*
diff --git a/arch/arm/mach-ixp4xx/common-pci.c b/arch/arm/mach-ixp4xx/common-pci.c
index d7db10c..e2e98bb 100644
--- a/arch/arm/mach-ixp4xx/common-pci.c
+++ b/arch/arm/mach-ixp4xx/common-pci.c
@@ -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;
 }
 
 /*
-- 
cgit v0.10.2