From patchwork Mon Jul 4 08:50:57 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell King - ARM Linux X-Patchwork-Id: 941862 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p648s7Av031588 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 4 Jul 2011 08:54:28 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qdesc-0002ze-C9; Mon, 04 Jul 2011 08:51:48 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QdesE-0003pd-Nj; Mon, 04 Jul 2011 08:51:22 +0000 Received: from [2002:4e20:1eda::1] (helo=caramon.arm.linux.org.uk) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qderx-0003jg-T0 for linux-arm-kernel@lists.infradead.org; Mon, 04 Jul 2011 08:51:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=arm.linux.org.uk; s=caramon; h=Date:Sender:Message-Id:Content-Type:MIME-Version:Cc:Subject:Cc:To:From:References:In-Reply-To; bh=1I0BwEZDZN6HvbX08kswv+CGzlT6Lkugnv51JuaZaig=; b=YpnlqzxfrJPox7zg3ye24/Gji/lTS2PrfqpSaymgg14FgD1IV+dBSwc1Xc2ToMesuFNcuViHu8GRpJbIZ1I48aCH2xtuSOhpOimvJNeOpPehpLbwQoRryY6CyMvsgI48vdNcc7KMeh1XAeDUQw08boa3O5vtE4wIOi2f+WSOVS0=; Received: from e0022681537dd.dyn.arm.linux.org.uk ([2002:4e20:1eda:1:222:68ff:fe15:37dd] helo=rmk-PC.arm.linux.org.uk) by caramon.arm.linux.org.uk with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1Qderr-0001Cb-3p; Mon, 04 Jul 2011 09:50:59 +0100 Received: from rmk by rmk-PC.arm.linux.org.uk with local (Exim 4.76) (envelope-from ) id 1Qderp-0000Zi-7l; Mon, 04 Jul 2011 09:50:57 +0100 In-Reply-To: <20110704084711.GN21898@n2100.arm.linux.org.uk> References: <20110704084711.GN21898@n2100.arm.linux.org.uk> From: Russell King - ARM Linux To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 10/10] ARM: dmabounce: no need to check dev->bus type in needs_bounce function MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Mon, 04 Jul 2011 09:50:57 +0100 X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110704_045106_738503_25CA56D9 X-CRM114-Status: GOOD ( 13.84 ) X-Spam-Score: 1.2 (+) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (1.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 1.3 RDNS_NONE Delivered to internal network by a host with no rDNS 0.0 TO_NO_BRKTS_NORDNS To: misformatted and no rDNS Cc: Imre Kaloz , Krzysztof Halasa , Mike Rapoport , Eric Miao , Marek Szyprowski X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Mon, 04 Jul 2011 08:54:28 +0000 (UTC) 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 --- arch/arm/common/it8152.c | 3 +-- arch/arm/mach-ixp4xx/common-pci.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) 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; } /*