Commit 709eb502 authored Mar 22, 2006 by Lennert Buytenhek Committed by Russell King Mar 22, 2006

[ARM] 3380/1: ixp2000: simplify ixdp2x00_master_npu() check



Patch from Lennert Buytenhek

On the IXDP2x00s, the NPU that is PCI master is always the egress
(i.e. 'master') NPU.  At least on the IXDP2800, both NPUs have flash,
so the ixp2000_has_flash() check in ixdp2x00_master_npu() is useless.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent e99053e0

include/asm-arm/arch-ixp2000/ixdp2x00.h

+2 −3

Original line number	Diff line number	Diff line
		@@ -72,12 +72,11 @@

		#ifndef __ASSEMBLY__
		/*
		* Master NPU will always have flash and be PCI master.
		* Slave NPU may or may not have flash but will never be PCI master.
		* The master NPU is always PCI master.
		*/
		static inline unsigned int ixdp2x00_master_npu(void)
		{
		return ((ixp2000_has_flash()) && (ixp2000_is_pcimaster()));
		return !!ixp2000_is_pcimaster();
		}

		/*