From: Benjamin Romer <benjamin.romer@unisys.com>
Date: Sun, 3 Aug 2014 02:03:39 +0000 (-0400)
Subject: staging: unisys: remove INLINE define from commontypes
X-Git-Tag: firefly_0821_release~176^2~3121^2~1409
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2046fcca74148b627577c6324c811c7e894fa45d;p=firefly-linux-kernel-4.4.55.git

staging: unisys: remove INLINE define from commontypes

There was a macro for INLINE. Delete it and fix the one occurrance of it to
just use 'inline' instead, though that function looks awfully big for an
inline...

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/staging/unisys/common-spar/include/channels/iochannel.h b/drivers/staging/unisys/common-spar/include/channels/iochannel.h
index 8e81bc93c01d..06f466a51cc1 100644
--- a/drivers/staging/unisys/common-spar/include/channels/iochannel.h
+++ b/drivers/staging/unisys/common-spar/include/channels/iochannel.h
@@ -882,7 +882,7 @@ static inline int ULTRA_VNIC_init_channel(ULTRA_IO_CHANNEL_PROTOCOL *x,
 /* returns next non-zero index on success or zero on failure (i.e. out of
  * room)
  */
-static INLINE  u16
+static inline  u16
 add_physinfo_entries(u32 inp_pfn,	/* input - specifies the pfn to be used
 					 * to add entries */
 		     u16 inp_off,	/* input - specifies the off to be used
diff --git a/drivers/staging/unisys/include/commontypes.h b/drivers/staging/unisys/include/commontypes.h
index 34b31ad7b934..2301984cde7d 100644
--- a/drivers/staging/unisys/include/commontypes.h
+++ b/drivers/staging/unisys/include/commontypes.h
@@ -27,7 +27,6 @@
 
 typedef u64 GUEST_PHYSICAL_ADDRESS;
 
-#define INLINE inline
 #define OFFSETOF offsetof
 
 #define CHANNEL_GUID_MISMATCH(chType, chName, field, expected, actual, fil, \