From 2131246e7902317a72fdb1091027239f9ddd7fa6 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sat, 21 Jan 2012 09:28:53 +0000
Subject: [PATCH] --- yaml --- r: 286909 b: refs/heads/master c:
 2a7f51a3e08cdaeea78d9e101a0079422a55bbc3 h: refs/heads/master i:   286907:
 3dec0dbccd65c04542018711faeaa7440663cb48 v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/mfd/mcp.h | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 803ddf8dfeb1..108f65545d5c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 98250221691f728b7cad6deed98866f8847e683f
+refs/heads/master: 2a7f51a3e08cdaeea78d9e101a0079422a55bbc3
diff --git a/trunk/include/linux/mfd/mcp.h b/trunk/include/linux/mfd/mcp.h
index ee496708e38b..f88c1cc0cb0f 100644
--- a/trunk/include/linux/mfd/mcp.h
+++ b/trunk/include/linux/mfd/mcp.h
@@ -64,6 +64,9 @@ void mcp_driver_unregister(struct mcp_driver *);
 #define mcp_get_drvdata(mcp)	dev_get_drvdata(&(mcp)->attached_device)
 #define mcp_set_drvdata(mcp,d)	dev_set_drvdata(&(mcp)->attached_device, d)
 
-#define mcp_priv(mcp)		((void *)((mcp)+1))
+static inline void *mcp_priv(struct mcp *mcp)
+{
+	return mcp + 1;
+}
 
 #endif