From 3dd7f2bff920c5942acbacf5ace4896b439d87cf Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Thu, 9 Dec 2010 19:29:05 -0800
Subject: [PATCH] --- yaml --- r: 227607 b: refs/heads/master c:
 16ee4cc82b5dbb81a5dbfedcdb268b9467fe4605 h: refs/heads/master i:   227605:
 0bc6e8593b9dca94ed822e872e1a6fb244524c60   227603:
 6af48a067cfde46046f257566a5d5dfeca9bccd2   227599:
 8c19aa2d42cebee6bc78030d61a29f0c11ead5ae v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/hid/hid-core.c | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index b4b8b0a102c0..1083411d710b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe2580204d8bbcd18540736a283ed0b784c6a024
+refs/heads/master: 16ee4cc82b5dbb81a5dbfedcdb268b9467fe4605
diff --git a/trunk/drivers/hid/hid-core.c b/trunk/drivers/hid/hid-core.c
index 5ddace093f0f..e6b90622e4eb 100644
--- a/trunk/drivers/hid/hid-core.c
+++ b/trunk/drivers/hid/hid-core.c
@@ -739,8 +739,8 @@ static u32 s32ton(__s32 value, unsigned n)
  * Search linux-kernel and linux-usb-devel archives for "hid-core extract".
  */
 
-static __inline__ __u32 extract(const struct hid_device *hid, __u8 *report,
-				unsigned offset, unsigned n)
+static __u32 extract(const struct hid_device *hid, __u8 *report,
+		     unsigned offset, unsigned n)
 {
 	u64 x;
 
@@ -763,8 +763,8 @@ static __inline__ __u32 extract(const struct hid_device *hid, __u8 *report,
  * endianness of register values by considering a register
  * a "cached" copy of the little endiad bit stream.
  */
-static __inline__ void implement(const struct hid_device *hid, __u8 *report,
-				 unsigned offset, unsigned n, __u32 value)
+static void implement(const struct hid_device *hid, __u8 *report,
+		      unsigned offset, unsigned n, __u32 value)
 {
 	u64 x;
 	u64 m = (1ULL << n) - 1;
@@ -792,7 +792,7 @@ static __inline__ void implement(const struct hid_device *hid, __u8 *report,
  * Search an array for a value.
  */
 
-static __inline__ int search(__s32 *array, __s32 value, unsigned n)
+static int search(__s32 *array, __s32 value, unsigned n)
 {
 	while (n--) {
 		if (*array++ == value)