From: Lennert Buytenhek <buytenh@wantstofly.org>
Date: Sat, 29 Oct 2005 15:28:27 +0000 (+0100)
Subject: [ARM] 3051/1: turn ixp2000_reg_read into an inline function
X-Git-Tag: v2.6.15-rc1~731^2^2~5
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ecbea7a2dae94092db9566bcd1f38535e9b3cde9;p=linux-2.6

[ARM] 3051/1: turn ixp2000_reg_read into an inline function

Patch from Lennert Buytenhek

Turn ixp2000_reg_read into an inline function.

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

diff --git a/include/asm-arm/arch-ixp2000/platform.h b/include/asm-arm/arch-ixp2000/platform.h
index aabeef2454..6e5b6a955a 100644
--- a/include/asm-arm/arch-ixp2000/platform.h
+++ b/include/asm-arm/arch-ixp2000/platform.h
@@ -15,11 +15,15 @@
 
 #ifndef __ASSEMBLY__
 
+static inline unsigned long ixp2000_reg_read(volatile void *reg)
+{
+	return *((volatile unsigned long *)reg);
+}
+
 static inline void ixp2000_reg_write(volatile void *reg, unsigned long val)
 {
 	*((volatile unsigned long *)reg) = val;
 }
-#define ixp2000_reg_read(reg)	(*((volatile unsigned long *)reg))
 
 /*
  * Boards may multiplex different devices on the 2nd channel of